diff --git a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkDataNodeSetControlPointAction.cpp b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkDataNodeSetControlPointAction.cpp
index 61305de34c..c6a9cf19f4 100644
--- a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkDataNodeSetControlPointAction.cpp
+++ b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkDataNodeSetControlPointAction.cpp
@@ -1,102 +1,102 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // semantic relations plugin
 #include "QmitkDataNodeSetControlPointAction.h"
 
 // semantic relations module
 #include <mitkDICOMHelper.h>
 #include <mitkSemanticRelationException.h>
 #include <mitkSemanticRelationsInference.h>
 #include <mitkUIDGeneratorBoost.h>
 
 // semantic relations UI module
 #include "QmitkControlPointDialog.h"
 
 // mitk gui common plugin
 #include <mitkDataNodeSelection.h>
 
 // qt
 #include <QInputDialog>
 
 QmitkDataNodeSetControlPointAction::QmitkDataNodeSetControlPointAction(QWidget* parent, berry::IWorkbenchPartSite::Pointer workbenchPartSite)
   : QAction(parent)
   , QmitkAbstractSemanticRelationsAction(workbenchPartSite)
 {
   setText(tr("Set control point"));
   m_Parent = parent;
   InitializeAction();
 }
 
 QmitkDataNodeSetControlPointAction::QmitkDataNodeSetControlPointAction(QWidget* parent, berry::IWorkbenchPartSite* workbenchPartSite)
   : QAction(parent)
   , QmitkAbstractSemanticRelationsAction(berry::IWorkbenchPartSite::Pointer(workbenchPartSite))
 {
   setText(tr("Set control point"));
   m_Parent = parent;
   InitializeAction();
 }
 
 QmitkDataNodeSetControlPointAction::~QmitkDataNodeSetControlPointAction()
 {
   // nothing here
 }
 
 void QmitkDataNodeSetControlPointAction::InitializeAction()
 {
   connect(this, &QAction::triggered, this, &QmitkDataNodeSetControlPointAction::OnActionTriggered);
 }
 
 void QmitkDataNodeSetControlPointAction::OnActionTriggered(bool checked)
 {
   if (nullptr == m_SemanticRelationsIntegration)
   {
     return;
   }
 
   auto dataNode = GetSelectedNode();
   if (dataNode.IsNull())
   {
     return;
   }
 
   QmitkControlPointDialog* inputDialog = new QmitkControlPointDialog(m_Parent);
   inputDialog->setWindowTitle("Set control point");
   inputDialog->SetCurrentDate(mitk::SemanticRelationsInference::GetControlPointOfImage(dataNode));
 
   int dialogReturnValue = inputDialog->exec();
   if (QDialog::Rejected == dialogReturnValue)
   {
     return;
   }
 
   const QDate& userSelectedDate = inputDialog->GetCurrentDate();
   mitk::SemanticTypes::ControlPoint controlPoint;
   controlPoint.UID = mitk::UIDGeneratorBoost::GenerateUID();
   controlPoint.date = boost::gregorian::date(userSelectedDate.year(),
                                              userSelectedDate.month(),
                                              userSelectedDate.day());
 
   try
   {
     m_SemanticRelationsIntegration->UnlinkImageFromControlPoint(dataNode);
-    m_SemanticRelationsIntegration->SetControlPointOfData(dataNode, controlPoint);
+    m_SemanticRelationsIntegration->SetControlPointOfImage(dataNode, controlPoint);
   }
   catch (const mitk::SemanticRelationException&)
   {
     return;
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.cpp b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.cpp
index 327874c39f..c50f2d0f2b 100644
--- a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.cpp
+++ b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkLesionInfoWidget.cpp
@@ -1,431 +1,431 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // semantic relations plugin
 #include "QmitkLesionInfoWidget.h"
 #include "QmitkSemanticRelationsNodeSelectionDialog.h"
 
 // semantic relations UI module
 #include <QmitkLesionTextDialog.h>
 
 // semantic relations module
 #include <mitkLesionManager.h>
 #include <mitkNodePredicates.h>
 #include <mitkSemanticRelationException.h>
 #include <mitkSemanticRelationsInference.h>
 #include <mitkRelationStorage.h>
 
 // registration ontology module
 #include <mitkLesionPropagation.h>
 
 // qt
 #include <QCompleter>
 #include <QListWidget>
 #include <QMenu>
 #include <QMessageBox>
 #include <QString>
 
 QmitkLesionInfoWidget::QmitkLesionInfoWidget(mitk::DataStorage* dataStorage, QWidget* parent /*= nullptr*/)
   : QWidget(parent)
   , m_DataStorage(dataStorage)
   , m_SemanticRelationsDataStorageAccess(std::make_unique<mitk::SemanticRelationsDataStorageAccess>(dataStorage))
   , m_SemanticRelationsIntegration(std::make_unique<mitk::SemanticRelationsIntegration>())
 {
   Initialize();
 }
 
 QmitkLesionInfoWidget::~QmitkLesionInfoWidget()
 {
   // nothing here
 }
 
 void QmitkLesionInfoWidget::Initialize()
 {
   m_Controls.setupUi(this);
 
   m_Controls.lesionTreeView->setAlternatingRowColors(true);
   m_Controls.lesionTreeView->setSelectionMode(QAbstractItemView::SingleSelection);
   m_Controls.lesionTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
   m_Controls.lesionTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
 
   m_StorageModel = new QmitkLesionTreeModel(m_Controls.lesionTreeView);
   if (m_DataStorage.IsExpired())
   {
     return;
   }
 
   auto dataStorage = m_DataStorage.Lock();
   m_StorageModel->SetDataStorage(dataStorage);
   m_Controls.lesionTreeView->setModel(m_StorageModel);
 
   SetUpConnections();
 }
 
 void QmitkLesionInfoWidget::SetUpConnections()
 {
   connect(m_StorageModel, &QmitkLesionTreeModel::ModelUpdated, this, &QmitkLesionInfoWidget::OnModelUpdated);
 
   // connect buttons to modify semantic relations
   connect(m_Controls.addLesionPushButton, &QPushButton::clicked, this, &QmitkLesionInfoWidget::OnAddLesionButtonClicked);
 
   // connect each list widget with a custom slots
   connect(m_Controls.lesionTreeView->selectionModel(), &QItemSelectionModel::currentChanged, this, &QmitkLesionInfoWidget::OnSelectionChanged);
 
   // connect context menu entries
   connect(m_Controls.lesionTreeView, &QTreeView::customContextMenuRequested, this, &QmitkLesionInfoWidget::OnLesionListContextMenuRequested);
 }
 
 void QmitkLesionInfoWidget::SetCaseID(const mitk::SemanticTypes::CaseID& caseID)
 {
   m_CaseID = caseID;
   m_StorageModel->SetCaseID(caseID);
 }
 
 void QmitkLesionInfoWidget::SetDataNodeSelection(const QList<mitk::DataNode::Pointer>& dataNodeSelection)
 {
   m_StorageModel->SetDataNodeSelection(dataNodeSelection);
 }
 
 //////////////////////////////////////////////////////////////////////////
 // Implementation of the QT_SLOTS
 //////////////////////////////////////////////////////////////////////////
 void QmitkLesionInfoWidget::OnModelUpdated()
 {
   m_Controls.lesionTreeView->expandAll();
   int columns = m_Controls.lesionTreeView->model()->columnCount();
   for (int i = 0; i < columns; ++i)
   {
     m_Controls.lesionTreeView->resizeColumnToContents(i);
   }
 }
 
 void QmitkLesionInfoWidget::OnAddLesionButtonClicked()
 {
   if (m_CaseID.empty())
   {
     QMessageBox msgBox;
     msgBox.setWindowTitle("No case ID set.");
     msgBox.setText("In order to add a lesion, please specify the current case / patient.");
     msgBox.setIcon(QMessageBox::Warning);
     msgBox.exec();
     return;
   }
 
   mitk::SemanticTypes::Lesion newLesion = mitk::GenerateNewLesion();
   try
   {
     m_SemanticRelationsIntegration->AddLesion(m_CaseID, newLesion);
   }
   catch (mitk::SemanticRelationException& e)
   {
     MITK_INFO << "Could not add a new lesion. " << e;
   }
 }
 
 void QmitkLesionInfoWidget::OnSelectionChanged(const QModelIndex& current, const QModelIndex& previous)
 {
   // only the UID is needed to identify a representing lesion
   QVariant data = m_StorageModel->data(current, Qt::UserRole);
   if (!data.canConvert<QmitkLesionTreeItem*>())
   {
     return;
   }
 
   auto lesion = data.value<QmitkLesionTreeItem*>()->GetData().GetLesion();
   if (false == mitk::SemanticRelationsInference::InstanceExists(m_CaseID, lesion))
   {
     // no UID of a existing lesion found; cannot create a lesion
     return;
   }
 
   // if selected data nodes are set, reset to empty list to
   // hide "selected data nodes presence background highlighting" in the model
   if (!m_StorageModel->GetSelectedDataNodes().isEmpty())
   {
     m_StorageModel->SetDataNodeSelection(QList<mitk::DataNode::Pointer>());
   }
 
   emit LesionSelectionChanged(lesion);
 }
 
 void QmitkLesionInfoWidget::OnLesionListContextMenuRequested(const QPoint& pos)
 {
   if (nullptr == m_SemanticRelationsIntegration)
   {
     return;
   }
 
   if (m_CaseID.empty())
   {
     QMessageBox msgBox(QMessageBox::Warning,
       "No case ID set.",
       "In order to access the context menu entries a case ID has to be set.");
     msgBox.exec();
     return;
   }
 
   QModelIndex index = m_Controls.lesionTreeView->indexAt(pos);
   if (!index.isValid())
   {
     // no item clicked; cannot retrieve the current lesion
     return;
   }
 
   QVariant data = m_StorageModel->data(index, Qt::UserRole);
   mitk::SemanticTypes::Lesion selectedLesion;
   if (data.canConvert<QmitkLesionTreeItem*>())
   {
     selectedLesion = data.value<QmitkLesionTreeItem*>()->GetData().GetLesion();
   }
   else
   {
     return;
   }
 
   QMenu* menu = new QMenu(m_Controls.lesionTreeView);
 
   QAction* linkToSegmentation = new QAction("Link to segmentation", this);
   linkToSegmentation->setEnabled(true);
   connect(linkToSegmentation, &QAction::triggered, [this, selectedLesion] { OnLinkToSegmentation(selectedLesion); });
   menu->addAction(linkToSegmentation);
 
   QAction* setLesionName = new QAction("Set lesion name", this);
   setLesionName->setEnabled(true);
   connect(setLesionName, &QAction::triggered, [this, selectedLesion] { OnSetLesionName(selectedLesion); });
   menu->addAction(setLesionName);
 
   QAction* setLesionClass = new QAction("Set lesion class", this);
   setLesionClass->setEnabled(true);
   connect(setLesionClass, &QAction::triggered, [this, selectedLesion] { OnSetLesionClass(selectedLesion); });
   menu->addAction(setLesionClass);
 
   QAction* propageLesionToImage = new QAction("Propagate lesion to image", this);
   propageLesionToImage->setEnabled(true);
   connect(propageLesionToImage, &QAction::triggered, [this, selectedLesion] { OnPropagateLesion(selectedLesion); });
   menu->addAction(propageLesionToImage);
 
   QAction* removeLesion = new QAction("Remove lesion", this);
   removeLesion->setEnabled(true);
   connect(removeLesion, &QAction::triggered, [this, selectedLesion] { OnRemoveLesion(selectedLesion); });
   menu->addAction(removeLesion);
 
   menu->popup(QCursor::pos());
 }
 
 void QmitkLesionInfoWidget::OnLinkToSegmentation(mitk::SemanticTypes::Lesion selectedLesion)
 {
   if (m_DataStorage.IsExpired())
   {
     return;
   }
 
   auto dataStorage = m_DataStorage.Lock();
 
   QmitkSemanticRelationsNodeSelectionDialog* dialog = new QmitkSemanticRelationsNodeSelectionDialog(this, "Select segmentation to link to the selected lesion.", "");
   dialog->setWindowTitle("Select segmentation node");
   dialog->SetDataStorage(dataStorage);
   dialog->SetNodePredicate(mitk::NodePredicates::GetSegmentationPredicate());
   dialog->SetSelectOnlyVisibleNodes(true);
   dialog->SetCaseID(m_CaseID);
 
   int dialogReturnValue = dialog->exec();
   if (QDialog::Rejected == dialogReturnValue)
   {
     return;
   }
 
   auto nodes = dialog->GetSelectedNodes();
   mitk::DataNode::Pointer selectedDataNode = nullptr;
   if (!nodes.isEmpty())
   {
     // only single selection allowed
     selectedDataNode = nodes.front();
   }
 
   if (nullptr == selectedDataNode
     || false == mitk::NodePredicates::GetSegmentationPredicate()->CheckNode(selectedDataNode))
   {
     QMessageBox msgBox(QMessageBox::Warning,
       "No valid segmentation node selected.",
       "In order to link the selected lesion to a segmentation, please specify a valid segmentation node.");
     msgBox.exec();
     return;
   }
 
   mitk::BaseData* baseData = selectedDataNode->GetData();
   if (nullptr == baseData)
   {
     QMessageBox msgBox(QMessageBox::Warning,
       "No valid base data.",
       "In order to link the selected lesion to a segmentation, please specify a valid segmentation node.");
     msgBox.exec();
     return;
   }
 
   try
   {
     m_SemanticRelationsIntegration->LinkSegmentationToLesion(selectedDataNode, selectedLesion);
   }
   catch (const mitk::SemanticRelationException& e)
   {
     std::stringstream exceptionMessage; exceptionMessage << e;
     QMessageBox msgBox(QMessageBox::Warning,
       "Could not link the selected lesion.",
       "The program wasn't able to correctly link the selected lesion with the selected segmentation.\n"
       "Reason:\n" + QString::fromStdString(exceptionMessage.str()));
     msgBox.exec();
   }
 }
 
 void QmitkLesionInfoWidget::OnSetLesionName(mitk::SemanticTypes::Lesion selectedLesion)
 {
   // use the lesion information to set the input text for the dialog
   QmitkLesionTextDialog* inputDialog = new QmitkLesionTextDialog(this);
   inputDialog->setWindowTitle("Set lesion name");
   inputDialog->SetLineEditText(selectedLesion.name);
 
   int dialogReturnValue = inputDialog->exec();
   if (QDialog::Rejected == dialogReturnValue)
   {
     return;
   }
 
   selectedLesion.name = inputDialog->GetLineEditText().toStdString();
   m_SemanticRelationsIntegration->OverwriteLesion(m_CaseID, selectedLesion);
 }
 
 void QmitkLesionInfoWidget::OnSetLesionClass(mitk::SemanticTypes::Lesion selectedLesion)
 {
   // use the lesion information to set the input text for the dialog
   QmitkLesionTextDialog* inputDialog = new QmitkLesionTextDialog(this);
   inputDialog->setWindowTitle("Set lesion class");
   inputDialog->SetLineEditText(selectedLesion.lesionClass.classType);
 
   // prepare the completer for the dialogs input text field
   mitk::LesionClassVector allLesionClasses = mitk::SemanticRelationsInference::GetAllLesionClassesOfCase(m_CaseID);
 
   QStringList wordList;
   for (const auto& lesionClass : allLesionClasses)
   {
     wordList << QString::fromStdString(lesionClass.classType);
   }
   QCompleter* completer = new QCompleter(wordList, this);
   completer->setCaseSensitivity(Qt::CaseInsensitive);
   inputDialog->GetLineEdit()->setCompleter(completer);
 
   int dialogReturnValue = inputDialog->exec();
   if (QDialog::Rejected == dialogReturnValue)
   {
     return;
   }
 
   // retrieve the new input lesion class type and check for an already existing lesion class types
   std::string newLesionClassType = inputDialog->GetLineEditText().toStdString();
   mitk::SemanticTypes::LesionClass existingLesionClass = mitk::FindExistingLesionClass(newLesionClassType, allLesionClasses);
   if (existingLesionClass.UID.empty())
   {
     // could not find lesion class information for the new lesion class type
     // create a new lesion class for the selected lesion
     existingLesionClass = mitk::GenerateNewLesionClass(newLesionClassType);
   }
 
   selectedLesion.lesionClass = existingLesionClass;
   m_SemanticRelationsIntegration->OverwriteLesion(m_CaseID, selectedLesion);
 }
 
 void QmitkLesionInfoWidget::OnPropagateLesion(mitk::SemanticTypes::Lesion selectedLesion)
 {
   if (m_DataStorage.IsExpired())
   {
     return;
   }
 
   auto dataStorage = m_DataStorage.Lock();
 
   QmitkSemanticRelationsNodeSelectionDialog* dialog = new QmitkSemanticRelationsNodeSelectionDialog(this, "Select data node to propagate the selected lesion.", "");
   dialog->setWindowTitle("Select image node");
   dialog->SetDataStorage(dataStorage);
   dialog->SetNodePredicate(mitk::NodePredicates::GetImagePredicate());
   dialog->SetSelectOnlyVisibleNodes(true);
   dialog->SetCaseID(m_CaseID);
   dialog->SetLesion(selectedLesion);
 
   int dialogReturnValue = dialog->exec();
   if (QDialog::Rejected == dialogReturnValue)
   {
     return;
   }
 
   auto nodes = dialog->GetSelectedNodes();
   mitk::DataNode::Pointer selectedDataNode = nullptr;
   if (!nodes.isEmpty())
   {
     // only single selection allowed
     selectedDataNode = nodes.front();
   }
 
   if (nullptr == selectedDataNode
     || false == mitk::NodePredicates::GetImagePredicate()->CheckNode(selectedDataNode))
   {
     QMessageBox msgBox(QMessageBox::Warning,
       "No valid image node selected.",
       "In order to propagate the selected lesion to an image, please specify a valid image node.");
     msgBox.exec();
     return;
   }
 
   mitk::BaseData* baseData = selectedDataNode->GetData();
   if (nullptr == baseData)
   {
     QMessageBox msgBox(QMessageBox::Warning,
       "No valid base data.",
       "In order to propagate the selected lesion to an image, please specify a valid image node.");
     msgBox.exec();
     return;
   }
 
   try
   {
     auto allSegmentationsOfLesion = m_SemanticRelationsDataStorageAccess->GetAllSegmentationsOfLesion(m_CaseID, selectedLesion);
-    mitk::LesionPropagation::FindClosestSegmentationMask();
+    mitk::FindClosestSegmentationMask();
   }
   catch (const mitk::SemanticRelationException& e)
   {
     std::stringstream exceptionMessage; exceptionMessage << e;
     QMessageBox msgBox(QMessageBox::Warning,
       "Could not propagate the selected lesion.",
       "The program wasn't able to correctly propagate the selected lesion to the selected image.\n"
       "Reason:\n" + QString::fromStdString(exceptionMessage.str()));
     msgBox.exec();
   }
 }
 
 void QmitkLesionInfoWidget::OnRemoveLesion(mitk::SemanticTypes::Lesion selectedLesion)
 {
   try
   {
     m_SemanticRelationsIntegration->RemoveLesion(m_CaseID, selectedLesion);
   }
   catch (const mitk::SemanticRelationException& e)
   {
     std::stringstream exceptionMessage; exceptionMessage << e;
     QMessageBox msgBox(QMessageBox::Warning,
       "Could not remove the selected lesion.",
       "The program wasn't able to correctly remove the selected lesion from the semantic relations model.\n"
       "Reason:\n" + QString::fromStdString(exceptionMessage.str()));
     msgBox.exec();
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp
index 8166a94d17..a6fed8fb30 100644
--- a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp
+++ b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp
@@ -1,280 +1,278 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 // semantic relations plugin
 #include "QmitkSemanticRelationsView.h"
 #include "QmitkDataNodeAddToSemanticRelationsAction.h"
 #include "QmitkDataNodeRemoveFromSemanticRelationsAction.h"
 
 // semantic relations module
 #include <mitkDICOMHelper.h>
 #include <mitkNodePredicates.h>
-#include <mitkSemanticRelationException.h>
 #include <mitkSemanticRelationsInference.h>
 #include <mitkRelationStorage.h>
 
 // mitk qt widgets module
 #include <QmitkDnDDataNodeWidget.h>
 #include <QmitkRenderWindow.h>
 
 // mitk multi label module
 #include <mitkLabelSetImage.h>
 
 // berry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 
 // qt
 #include <QMenu>
 #include <QTreeView>
 
 const std::string QmitkSemanticRelationsView::VIEW_ID = "org.mitk.views.semanticrelations";
 
 void QmitkSemanticRelationsView::SetFocus()
 {
   // nothing here
 }
 
 void QmitkSemanticRelationsView::CreateQtPartControl(QWidget* parent)
 {
   // create GUI widgets
   m_Controls.setupUi(parent);
 
   m_LesionInfoWidget = new QmitkLesionInfoWidget(GetDataStorage(), parent);
   m_Controls.gridLayout->addWidget(m_LesionInfoWidget);
 
   m_PatientTableInspector = new QmitkPatientTableInspector(parent);
   m_PatientTableInspector->SetDataStorage(GetDataStorage());
   m_Controls.gridLayout->addWidget(m_PatientTableInspector);
 
   QGridLayout* dndDataNodeWidgetLayout = new QGridLayout;
   dndDataNodeWidgetLayout->addWidget(m_PatientTableInspector, 0, 0);
   dndDataNodeWidgetLayout->setContentsMargins(0, 0, 0, 0);
 
   m_DnDDataNodeWidget = new QmitkDnDDataNodeWidget(parent);
   m_DnDDataNodeWidget->setLayout(dndDataNodeWidgetLayout);
 
   m_Controls.gridLayout->addWidget(m_DnDDataNodeWidget);
 
   m_ContextMenu = new QmitkSemanticRelationsContextMenu(GetSite(), m_PatientTableInspector);
   m_ContextMenu->SetDataStorage(GetDataStorage());
 
   mitk::IRenderWindowPart* renderWindowPart = GetRenderWindowPart();
   if (nullptr != renderWindowPart)
   {
     RenderWindowPartActivated(renderWindowPart);
   }
 
   SetUpConnections();
 
   const auto& allCaseIDs = mitk::RelationStorage::GetAllCaseIDs();
   for (const auto& caseID : allCaseIDs)
   {
     AddToComboBox(caseID);
   }
 }
 
 void QmitkSemanticRelationsView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   // connect QmitkRenderWindows - underlying vtkRenderWindow is the same as "mitk::RenderingManager::GetInstance()->GetAllRegisteredRenderWindows()"
   QHash<QString, QmitkRenderWindow*> windowMap = renderWindowPart->GetQmitkRenderWindows();
   QHash<QString, QmitkRenderWindow*>::Iterator it;
 
   mitk::BaseRenderer* baseRenderer = nullptr;
   RenderWindowLayerUtilities::RendererVector controlledRenderer;
   for (it = windowMap.begin(); it != windowMap.end(); ++it)
   {
     baseRenderer = mitk::BaseRenderer::GetInstance(it.value()->GetVtkRenderWindow());
     if (nullptr != baseRenderer)
     {
       controlledRenderer.push_back(baseRenderer);
     }
   }
 
   m_ContextMenu->SetControlledRenderer(controlledRenderer);
 }
 
 void QmitkSemanticRelationsView::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   // nothing here
 }
 
 void QmitkSemanticRelationsView::SetUpConnections()
 {
   connect(m_Controls.caseIDComboBox, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this, &QmitkSemanticRelationsView::OnCaseIDSelectionChanged);
   connect(m_LesionInfoWidget, &QmitkLesionInfoWidget::LesionSelectionChanged, this, &QmitkSemanticRelationsView::OnLesionSelectionChanged);
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::CurrentSelectionChanged, this, &QmitkSemanticRelationsView::OnDataNodeSelectionChanged);
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::DataNodeDoubleClicked, this, &QmitkSemanticRelationsView::OnDataNodeDoubleClicked);
   connect(m_DnDDataNodeWidget, &QmitkDnDDataNodeWidget::NodesDropped, this, &QmitkSemanticRelationsView::OnNodesAdded);
 
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::OnContextMenuRequested, m_ContextMenu, &QmitkSemanticRelationsContextMenu::OnContextMenuRequested);
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::OnNodeRemoved, this, &QmitkSemanticRelationsView::NodeRemoved);
 }
 
 QItemSelectionModel* QmitkSemanticRelationsView::GetDataNodeSelectionModel() const
 {
   return m_PatientTableInspector->GetSelectionModel();
 }
 
 void QmitkSemanticRelationsView::NodeRemoved(const mitk::DataNode* dataNode)
 {
   if (nullptr == dataNode)
   {
     return;
   }
 
   if (mitk::SemanticRelationsInference::InstanceExists(dataNode))
   {
     // no observer needed for the integration; simply use a temporary instance for removing
     mitk::SemanticRelationsIntegration semanticRelationsIntegration;
     RemoveFromSemanticRelationsAction::Run(&semanticRelationsIntegration, dataNode);
     mitk::SemanticTypes::CaseID caseID = mitk::GetCaseIDFromDataNode(dataNode);
     RemoveFromComboBox(caseID);
   }
 }
 
 void QmitkSemanticRelationsView::OnLesionSelectionChanged(const mitk::SemanticTypes::Lesion& lesion)
 {
   m_PatientTableInspector->SetLesion(lesion);
 }
 
 void QmitkSemanticRelationsView::OnDataNodeSelectionChanged(const QList<mitk::DataNode::Pointer>& dataNodeSelection)
 {
   m_LesionInfoWidget->SetDataNodeSelection(dataNodeSelection);
 }
 
 void QmitkSemanticRelationsView::OnDataNodeDoubleClicked(const mitk::DataNode* dataNode)
 {
   if (nullptr == dataNode)
   {
     return;
   }
 
   if (mitk::NodePredicates::GetImagePredicate()->CheckNode(dataNode))
   {
     OpenInEditor(dataNode);
   }
   else if (mitk::NodePredicates::GetSegmentationPredicate()->CheckNode(dataNode))
   {
     JumpToPosition(dataNode);
   }
 }
 
 void QmitkSemanticRelationsView::OnCaseIDSelectionChanged(const QString& caseID)
 {
   m_LesionInfoWidget->SetCaseID(caseID.toStdString());
   m_PatientTableInspector->SetCaseID(caseID.toStdString());
 }
 
-void QmitkSemanticRelationsView::OnNodesAdded(QmitkDnDDataNodeWidget* dnDDataNodeWidget, std::vector<mitk::DataNode*> nodes)
+void QmitkSemanticRelationsView::OnNodesAdded(std::vector<mitk::DataNode*> nodes)
 {
   mitk::SemanticTypes::CaseID caseID = "";
   for (mitk::DataNode* dataNode : nodes)
   {
     // no observer needed for the integration; simply use a temporary instance for adding
     mitk::SemanticRelationsIntegration semanticRelationsIntegration;
     AddToSemanticRelationsAction::Run(&semanticRelationsIntegration, GetDataStorage(), dataNode);
     caseID = mitk::GetCaseIDFromDataNode(dataNode);
     AddToComboBox(caseID);
   }
 }
 
 void QmitkSemanticRelationsView::OnNodeRemoved(const mitk::DataNode* dataNode)
 {
   NodeRemoved(dataNode);
 }
 
 void QmitkSemanticRelationsView::AddToComboBox(const mitk::SemanticTypes::CaseID& caseID)
 {
   int foundIndex = m_Controls.caseIDComboBox->findText(QString::fromStdString(caseID));
   if (-1 == foundIndex)
   {
     // add the caseID to the combo box, as it is not already contained
     m_Controls.caseIDComboBox->addItem(QString::fromStdString(caseID));
   }
 }
 
 void QmitkSemanticRelationsView::RemoveFromComboBox(const mitk::SemanticTypes::CaseID& caseID)
 {
   std::vector<mitk::SemanticTypes::ControlPoint> allControlPoints = mitk::RelationStorage::GetAllControlPointsOfCase(caseID);
   int foundIndex = m_Controls.caseIDComboBox->findText(QString::fromStdString(caseID));
   if (allControlPoints.empty() && -1 != foundIndex)
   {
-    // TODO: find new way to check for empty case id
     // caseID does not contain any control points and therefore no data
     // remove the caseID, if it is still contained
     m_Controls.caseIDComboBox->removeItem(foundIndex);
   }
 }
 
 void QmitkSemanticRelationsView::OpenInEditor(const mitk::DataNode* dataNode)
 {
   auto renderWindowPart = GetRenderWindowPart();
   if (nullptr == renderWindowPart)
   {
     renderWindowPart = GetRenderWindowPart(mitk::WorkbenchUtil::IRenderWindowPartStrategy::BRING_TO_FRONT | mitk::WorkbenchUtil::IRenderWindowPartStrategy::OPEN);
     if (nullptr == renderWindowPart)
     {
       // no render window available
       return;
     }
   }
 
   auto image = dynamic_cast<mitk::Image*>(dataNode->GetData());
   if (nullptr != image)
   {
     mitk::RenderingManager::GetInstance()->InitializeViews(image->GetTimeGeometry(), mitk::RenderingManager::REQUEST_UPDATE_ALL, true);
   }
 }
 
 void QmitkSemanticRelationsView::JumpToPosition(const mitk::DataNode* dataNode)
 {
   if (nullptr == dataNode)
   {
     return;
   }
 
   mitk::LabelSetImage* labelSetImage = dynamic_cast<mitk::LabelSetImage*>(dataNode->GetData());
   if (nullptr == labelSetImage)
   {
     return;
   }
 
   int activeLayer = labelSetImage->GetActiveLayer();
   mitk::Label* activeLabel = labelSetImage->GetActiveLabel(activeLayer);
   labelSetImage->UpdateCenterOfMass(activeLabel->GetValue(), activeLayer);
   const mitk::Point3D& centerPosition = activeLabel->GetCenterOfMassCoordinates();
   if (centerPosition.GetVnlVector().max_value() > 0.0)
   {
     auto renderWindowPart = GetRenderWindowPart();
     if (nullptr == renderWindowPart)
     {
       renderWindowPart = GetRenderWindowPart(mitk::WorkbenchUtil::IRenderWindowPartStrategy::BRING_TO_FRONT | mitk::WorkbenchUtil::IRenderWindowPartStrategy::OPEN);
       if (nullptr == renderWindowPart)
       {
         // no render window available
         return;
       }
     }
 
     auto segmentation = dynamic_cast<mitk::LabelSetImage*>(dataNode->GetData());
     if (nullptr != segmentation)
     {
       renderWindowPart->SetSelectedPosition(centerPosition);
       mitk::RenderingManager::GetInstance()->InitializeViews(segmentation->GetTimeGeometry(), mitk::RenderingManager::REQUEST_UPDATE_ALL, true);
     }
   }
 }