diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.cpp b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.cpp
index 7835cab9d4..d4ee664023 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.cpp
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.cpp
@@ -1,83 +1,86 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "QmitkPropertiesPreferencePage.h"
 #include <berryIPreferencesService.h>
 #include <berryPlatform.h>
 
 const QString QmitkPropertiesPreferencePage::FILTER_PROPERTIES = "filter properties";
 const QString QmitkPropertiesPreferencePage::SHOW_ALIASES = "show aliases";
 const QString QmitkPropertiesPreferencePage::SHOW_DESCRIPTIONS = "show descriptions";
 const QString QmitkPropertiesPreferencePage::SHOW_ALIASES_IN_DESCRIPTION = "show aliases in description";
+const QString QmitkPropertiesPreferencePage::SHOW_PERSISTENCE_IN_DESCRIPTION = "show persistence in description";
 const QString QmitkPropertiesPreferencePage::DEVELOPER_MODE = "enable developer mode";
 
 QmitkPropertiesPreferencePage::QmitkPropertiesPreferencePage()
   : m_Control(nullptr),
     m_Preferences(berry::Platform::GetPreferencesService()->GetSystemPreferences()->Node("/org.mitk.views.properties"))
 {
 }
 
 QmitkPropertiesPreferencePage::~QmitkPropertiesPreferencePage()
 {
 }
 
 void QmitkPropertiesPreferencePage::CreateQtControl(QWidget* parent)
 {
   m_Control = new QWidget(parent);
   m_Controls.setupUi(m_Control);
 
   connect(m_Controls.showDescriptionsCheckBox, SIGNAL(stateChanged(int)), this, SLOT(OnShowDescriptionsStateChanged(int)));
 
   this->Update();
 }
 
 QWidget* QmitkPropertiesPreferencePage::GetQtControl() const
 {
   return m_Control;
 }
 
 void QmitkPropertiesPreferencePage::Init(berry::IWorkbench::Pointer)
 {
 }
 
 void QmitkPropertiesPreferencePage::OnShowDescriptionsStateChanged(int state)
 {
   m_Controls.showAliasesInDescriptionCheckBox->setEnabled(state != Qt::Unchecked);
 }
 
 bool QmitkPropertiesPreferencePage::PerformOk()
 {
   m_Preferences->PutBool(FILTER_PROPERTIES, m_Controls.filterPropertiesCheckBox->isChecked());
   m_Preferences->PutBool(SHOW_ALIASES, m_Controls.showAliasesCheckBox->isChecked());
   m_Preferences->PutBool(SHOW_DESCRIPTIONS, m_Controls.showDescriptionsCheckBox->isChecked());
   m_Preferences->PutBool(SHOW_ALIASES_IN_DESCRIPTION, m_Controls.showAliasesInDescriptionCheckBox->isChecked());
+  m_Preferences->PutBool(SHOW_PERSISTENCE_IN_DESCRIPTION, m_Controls.showPersistenceInDescriptionCheckBox->isChecked());
   m_Preferences->PutBool(DEVELOPER_MODE, m_Controls.enableDeveloperModeCheckBox->isChecked());
 
   return true;
 }
 
 void QmitkPropertiesPreferencePage::PerformCancel()
 {
 }
 
 void QmitkPropertiesPreferencePage::Update()
 {
   m_Controls.filterPropertiesCheckBox->setChecked(m_Preferences->GetBool(FILTER_PROPERTIES, true));
   m_Controls.showAliasesCheckBox->setChecked(m_Preferences->GetBool(SHOW_ALIASES, true));
   m_Controls.showDescriptionsCheckBox->setChecked(m_Preferences->GetBool(SHOW_DESCRIPTIONS, true));
   m_Controls.showAliasesInDescriptionCheckBox->setChecked(m_Preferences->GetBool(SHOW_ALIASES_IN_DESCRIPTION, true));
+  m_Controls.showPersistenceInDescriptionCheckBox->setChecked(m_Preferences->GetBool(SHOW_PERSISTENCE_IN_DESCRIPTION, true));
   m_Controls.enableDeveloperModeCheckBox->setChecked(m_Preferences->GetBool(DEVELOPER_MODE, false));
 }
diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.h b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.h
index d90a79facf..f482d6d1c3 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.h
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.h
@@ -1,54 +1,55 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef QmitkPropertiesPreferencePage_h
 #define QmitkPropertiesPreferencePage_h
 
 #include <berryIQtPreferencePage.h>
 #include <ui_QmitkPropertiesPreferencePage.h>
 
 class QmitkPropertiesPreferencePage : public QObject, public berry::IQtPreferencePage
 {
   Q_OBJECT
   Q_INTERFACES(berry::IPreferencePage)
 
 public:
   static const QString FILTER_PROPERTIES;
   static const QString SHOW_ALIASES;
   static const QString SHOW_DESCRIPTIONS;
   static const QString SHOW_ALIASES_IN_DESCRIPTION;
+  static const QString SHOW_PERSISTENCE_IN_DESCRIPTION;
   static const QString DEVELOPER_MODE;
 
   QmitkPropertiesPreferencePage();
   ~QmitkPropertiesPreferencePage();
 
   void CreateQtControl(QWidget* parent) override;
   QWidget* GetQtControl() const override;
   void Init(berry::IWorkbench::Pointer workbench) override;
   bool PerformOk() override;
   void PerformCancel() override;
   void Update() override;
 
 private slots:
   void OnShowDescriptionsStateChanged(int state);
 
 private:
   QWidget* m_Control;
   Ui::QmitkPropertiesPreferencePage m_Controls;
   berry::IPreferences::Pointer m_Preferences;
 };
 
 #endif
diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.ui b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.ui
index 318d3156ff..2732cacb72 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.ui
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertiesPreferencePage.ui
@@ -1,130 +1,143 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkPropertiesPreferencePage</class>
  <widget class="QWidget" name="QmitkPropertiesPreferencePage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>577</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <widget class="QGroupBox" name="aliasesGroupBox">
      <property name="title">
       <string>Aliases</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QCheckBox" name="showAliasesCheckBox">
         <property name="text">
          <string>Replace genuine property names by aliases</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="descriptionsGroupBox">
      <property name="title">
       <string>Descriptions</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="QCheckBox" name="showDescriptionsCheckBox">
         <property name="text">
          <string>Show descriptions</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="showAliasesInDescriptionCheckBox">
         <property name="styleSheet">
          <string notr="true">margin-left: 18px;</string>
         </property>
         <property name="text">
          <string>Show aliases of genuine property names</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="showPersistenceInDescriptionCheckBox">
+        <property name="styleSheet">
+         <string notr="true">margin-left: 18px;</string>
+        </property>
+        <property name="text">
+         <string>Show persistence info</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="filtersGroupBox">
      <property name="title">
       <string>Filters</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QCheckBox" name="filterPropertiesCheckBox">
         <property name="text">
          <string>Only show filtered properties</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="developerModeGroupBox">
      <property name="title">
       <string>Developer Mode</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
        <widget class="QCheckBox" name="enableDeveloperModeCheckBox">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="text">
          <string>Enabled</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>204</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>showAliasesCheckBox</tabstop>
   <tabstop>showDescriptionsCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp
index 8aa4bcabb5..38a9ec1348 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.cpp
@@ -1,416 +1,446 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "mitkGetPropertyService.h"
 #include "QmitkAddNewPropertyDialog.h"
 #include "QmitkPropertiesPreferencePage.h"
 #include "QmitkPropertyItemDelegate.h"
 #include "QmitkPropertyItemModel.h"
 #include "QmitkPropertyItemSortFilterProxyModel.h"
 #include "QmitkPropertyTreeView.h"
 #include <berryIBerryPreferences.h>
 #include <mitkIPropertyAliases.h>
 #include <mitkIPropertyDescriptions.h>
+#include <mitkIPropertyPersistence.h>
 #include <QmitkRenderWindow.h>
 #include <QPainter>
 #include <memory>
 
 const std::string QmitkPropertyTreeView::VIEW_ID = "org.mitk.views.properties";
 
 QmitkPropertyTreeView::QmitkPropertyTreeView()
-  : m_Parent(NULL),
+  : m_Parent(nullptr),
     m_PropertyNameChangedTag(0),
-    m_PropertyAliases(NULL),
-    m_PropertyDescriptions(NULL),
+    m_PropertyAliases(nullptr),
+    m_PropertyDescriptions(nullptr),
+    m_PropertyPersistence(nullptr),
     m_ShowAliasesInDescription(true),
+    m_ShowPersistenceInDescription(true),
     m_DeveloperMode(false),
-    m_ProxyModel(NULL),
-    m_Model(NULL),
-    m_Delegate(NULL),
-    m_Renderer(NULL)
+    m_ProxyModel(nullptr),
+    m_Model(nullptr),
+    m_Delegate(nullptr),
+    m_Renderer(nullptr)
 {
 }
 
 QmitkPropertyTreeView::~QmitkPropertyTreeView()
 {
 }
 
 void QmitkPropertyTreeView::CreateQtPartControl(QWidget* parent)
 {
   m_Parent = parent;
 
   m_Controls.setupUi(parent);
 
   m_Controls.propertyListComboBox->addItem("Data node: common");
 
   mitk::IRenderWindowPart* renderWindowPart = this->GetRenderWindowPart();
 
   if (renderWindowPart != NULL)
   {
     QHash<QString, QmitkRenderWindow*> renderWindows = renderWindowPart->GetQmitkRenderWindows();
 
     Q_FOREACH(QString renderWindow, renderWindows.keys())
     {
       m_Controls.propertyListComboBox->addItem(QString("Data node: ") + renderWindow);
     }
   }
 
   m_Controls.propertyListComboBox->addItem("Base data");
 
   m_Controls.newButton->setEnabled(false);
 
   m_Controls.description->hide();
   m_Controls.propertyListLabel->hide();
   m_Controls.propertyListComboBox->hide();
   m_Controls.newButton->hide();
 
   m_ProxyModel = new QmitkPropertyItemSortFilterProxyModel(m_Controls.treeView);
   m_Model = new QmitkPropertyItemModel(m_ProxyModel);
 
   m_ProxyModel->setSourceModel(m_Model);
   m_ProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
   m_ProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
   m_ProxyModel->setDynamicSortFilter(true);
 
   m_Delegate = new QmitkPropertyItemDelegate(m_Controls.treeView);
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
   m_Controls.filterLineEdit->setClearButtonEnabled(true);
 #endif
 
   m_Controls.treeView->setItemDelegateForColumn(1, m_Delegate);
   m_Controls.treeView->setModel(m_ProxyModel);
   m_Controls.treeView->setColumnWidth(0, 160);
   m_Controls.treeView->sortByColumn(0, Qt::AscendingOrder);
   m_Controls.treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
   m_Controls.treeView->setSelectionMode(QAbstractItemView::SingleSelection);
   m_Controls.treeView->setEditTriggers(QAbstractItemView::SelectedClicked | QAbstractItemView::DoubleClicked);
 
   connect(m_Controls.filterLineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(OnFilterTextChanged(const QString&)));
   connect(m_Controls.propertyListComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnPropertyListChanged(int)));
   connect(m_Controls.newButton, SIGNAL(clicked()), this, SLOT(OnAddNewProperty()));
   connect(m_Controls.treeView->selectionModel(), SIGNAL(currentRowChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(OnCurrentRowChanged(const QModelIndex&, const QModelIndex&)));
   connect(m_Model, SIGNAL(modelReset()), this, SLOT(OnModelReset()));
 }
 
 QString QmitkPropertyTreeView::GetPropertyNameOrAlias(const QModelIndex& index)
 {
   QString propertyName;
 
   if (index.isValid())
   {
     QModelIndex current = index;
 
     while (current.isValid())
     {
       QString name = m_ProxyModel->data(m_ProxyModel->index(current.row(), 0, current.parent())).toString();
 
       propertyName.prepend(propertyName.isEmpty()
         ? name
         : name.append('.'));
 
       current = current.parent();
     }
   }
 
   return propertyName;
 }
 
 void QmitkPropertyTreeView::OnCurrentRowChanged(const QModelIndex& current, const QModelIndex&)
 {
-  if (m_PropertyDescriptions != NULL && current.isValid())
+  if (m_PropertyDescriptions != nullptr && current.isValid())
   {
     QString name = this->GetPropertyNameOrAlias(current);
 
     if (!name.isEmpty())
     {
       QString alias;
       bool isTrueName = true;
 
-      if (m_PropertyAliases != NULL)
+      if (m_PropertyAliases != nullptr)
       {
         std::string trueName = m_PropertyAliases->GetPropertyName(name.toStdString());
 
         if (trueName.empty() && !m_SelectionClassName.empty())
           trueName = m_PropertyAliases->GetPropertyName(name.toStdString(), m_SelectionClassName);
 
         if (!trueName.empty())
         {
           alias = name;
           name = QString::fromStdString(trueName);
           isTrueName = false;
         }
       }
 
       QString description = QString::fromStdString(m_PropertyDescriptions->GetDescription(name.toStdString()));
       std::vector<std::string> aliases;
 
-      if (!isTrueName && m_PropertyAliases != NULL)
+      if (!isTrueName && m_PropertyAliases != nullptr)
       {
         aliases = m_PropertyAliases->GetAliases(name.toStdString(), m_SelectionClassName);
 
         if (aliases.empty() && !m_SelectionClassName.empty())
           aliases = m_PropertyAliases->GetAliases(name.toStdString());
       }
 
-      if (!description.isEmpty() || !aliases.empty())
+      bool isPersistent = false;
+      QString persistenceKey;
+
+      if (m_PropertyPersistence != nullptr)
+      {
+        isPersistent = m_PropertyPersistence->HasInfo(name.toStdString());
+
+        if (isPersistent)
+        {
+          persistenceKey = QString::fromStdString(m_PropertyPersistence->GetInfo(name.toStdString())->GetKey());
+
+          if (persistenceKey.isEmpty())
+            persistenceKey = name;
+        }
+      }
+
+      if (!description.isEmpty() || !aliases.empty() || isPersistent)
       {
         QString customizedDescription;
 
         if (m_ShowAliasesInDescription && !aliases.empty())
         {
           customizedDescription = "<h3 style=\"margin-bottom:0\">" + name + "</h3>";
 
           std::size_t numAliases = aliases.size();
           std::size_t lastAlias = numAliases - 1;
 
           for (std::size_t i = 0; i < numAliases; ++i)
           {
             customizedDescription += i != lastAlias
               ? "<h5 style=\"margin-top:0;margin-bottom:0\">"
               : "<h5 style=\"margin-top:0;margin-bottom:10px\">";
 
             customizedDescription += QString::fromStdString(aliases[i]) + "</h5>";
           }
         }
         else
         {
           customizedDescription = "<h3 style=\"margin-bottom:10px\">" + name + "</h3>";
         }
 
+        if (isPersistent)
+          customizedDescription += "<h5 style=\"margin-top:0;margin-bottom:10px\">Persistence key: " + persistenceKey + "</h5>";
+
         if (!description.isEmpty())
           customizedDescription += description;
 
         m_Controls.description->setText(customizedDescription);
         m_Controls.description->show();
 
         return;
       }
     }
   }
 
   m_Controls.description->hide();
 }
 
 void QmitkPropertyTreeView::OnFilterTextChanged(const QString& filter)
 {
   m_ProxyModel->setFilterWildcard(filter);
 
   if (filter.isEmpty())
     m_Controls.treeView->collapseAll();
   else
     m_Controls.treeView->expandAll();
 }
 
 void QmitkPropertyTreeView::OnModelReset()
 {
   m_Controls.description->hide();
 }
 
 void QmitkPropertyTreeView::OnPreferencesChanged(const berry::IBerryPreferences* preferences)
 {
   bool showAliases = preferences->GetBool(QmitkPropertiesPreferencePage::SHOW_ALIASES, true);
   bool showDescriptions = preferences->GetBool(QmitkPropertiesPreferencePage::SHOW_DESCRIPTIONS, true);
   bool showAliasesInDescription = preferences->GetBool(QmitkPropertiesPreferencePage::SHOW_ALIASES_IN_DESCRIPTION, true);
+  bool showPersistenceInDescription = preferences->GetBool(QmitkPropertiesPreferencePage::SHOW_PERSISTENCE_IN_DESCRIPTION, true);
   bool developerMode = preferences->GetBool(QmitkPropertiesPreferencePage::DEVELOPER_MODE, false);
 
   bool updateAliases = showAliases != (m_PropertyAliases != NULL);
   bool updateDescriptions = showDescriptions != (m_PropertyDescriptions != NULL);
   bool updateAliasesInDescription = showAliasesInDescription != m_ShowAliasesInDescription;
+  bool updatePersistenceInDescription = showPersistenceInDescription != m_ShowPersistenceInDescription;
   bool updateDeveloperMode = developerMode != m_DeveloperMode;
 
   if (updateAliases)
     m_PropertyAliases = showAliases
       ? mitk::GetPropertyService<mitk::IPropertyAliases>()
-      : NULL;
+      : nullptr;
 
   if (updateDescriptions)
     m_PropertyDescriptions = showDescriptions
       ? mitk::GetPropertyService<mitk::IPropertyDescriptions>()
-      : NULL;
+      : nullptr;
+
+  if (showPersistenceInDescription)
+    m_PropertyPersistence = mitk::GetPropertyService<mitk::IPropertyPersistence>();
 
   if (updateAliasesInDescription)
     m_ShowAliasesInDescription = showAliasesInDescription;
 
-  if (updateDescriptions || updateAliasesInDescription)
+  if (updatePersistenceInDescription)
+    m_ShowPersistenceInDescription = showPersistenceInDescription;
+
+  if (updateDescriptions || updateAliasesInDescription || updatePersistenceInDescription)
   {
     QModelIndexList selection = m_Controls.treeView->selectionModel()->selectedRows();
 
     if (!selection.isEmpty())
       this->OnCurrentRowChanged(selection[0], selection[0]);
   }
 
   if (updateDeveloperMode)
   {
     m_DeveloperMode = developerMode;
 
     if (!developerMode)
       m_Controls.propertyListComboBox->setCurrentIndex(0);
 
     m_Controls.propertyListLabel->setVisible(developerMode);
     m_Controls.propertyListComboBox->setVisible(developerMode);
     m_Controls.newButton->setVisible(developerMode);
   }
 
   m_Model->OnPreferencesChanged(preferences);
 }
 
 void QmitkPropertyTreeView::OnPropertyNameChanged(const itk::EventObject&)
 {
   mitk::PropertyList* propertyList = m_Model->GetPropertyList();
 
   if (propertyList != NULL)
   {
     mitk::BaseProperty* nameProperty = propertyList->GetProperty("name");
 
     if (nameProperty != NULL)
     {
       QString partName = "Properties (";
       partName.append(QString::fromStdString(nameProperty->GetValueAsString())).append(')');
       this->SetPartName(partName);
     }
   }
 }
 
 void QmitkPropertyTreeView::OnSelectionChanged(berry::IWorkbenchPart::Pointer, const QList<mitk::DataNode::Pointer>& nodes)
 {
   mitk::PropertyList* propertyList = m_Model->GetPropertyList();
 
   if (propertyList != NULL)
   {
     mitk::BaseProperty* nameProperty = propertyList->GetProperty("name");
 
     if (nameProperty != NULL)
       nameProperty->RemoveObserver(m_PropertyNameChangedTag);
 
     m_PropertyNameChangedTag = 0;
   }
 
   if (nodes.empty() || nodes.front().IsNull())
   {
     m_SelectedNode = NULL;
 
     this->SetPartName("Properties");
     m_Model->SetPropertyList(NULL);
     m_Delegate->SetPropertyList(NULL);
 
     m_Controls.newButton->setEnabled(false);
   }
   else
   {
     m_SelectedNode = nodes.front();
 
     QString selectionClassName = m_SelectedNode->GetData() != NULL
       ? m_SelectedNode->GetData()->GetNameOfClass()
       : "";
 
     m_SelectionClassName = selectionClassName.toStdString();
 
     mitk::PropertyList::Pointer propertyList;
 
     if (m_Renderer == NULL && m_Controls.propertyListComboBox->currentText() == "Base data")
     {
       propertyList = m_SelectedNode->GetData() != NULL
         ? m_SelectedNode->GetData()->GetPropertyList()
         : NULL;
     }
     else
     {
       propertyList = m_SelectedNode->GetPropertyList(m_Renderer);
     }
 
     m_Model->SetPropertyList(propertyList, selectionClassName);
     m_Delegate->SetPropertyList(propertyList);
 
     OnPropertyNameChanged(itk::ModifiedEvent());
 
     mitk::BaseProperty* nameProperty = m_SelectedNode->GetProperty("name");
 
     if (nameProperty != NULL)
     {
       itk::ReceptorMemberCommand<QmitkPropertyTreeView>::Pointer command = itk::ReceptorMemberCommand<QmitkPropertyTreeView>::New();
       command->SetCallbackFunction(this, &QmitkPropertyTreeView::OnPropertyNameChanged);
       m_PropertyNameChangedTag = nameProperty->AddObserver(itk::ModifiedEvent(), command);
     }
 
     m_Controls.newButton->setEnabled(true);
   }
 
   if (!m_ProxyModel->filterRegExp().isEmpty())
     m_Controls.treeView->expandAll();
 }
 
 void QmitkPropertyTreeView::SetFocus()
 {
   m_Controls.filterLineEdit->setFocus();
 }
 
 void QmitkPropertyTreeView::RenderWindowPartActivated(mitk::IRenderWindowPart* /*renderWindowPart*/)
 {
   if (m_Controls.propertyListComboBox->count() == 2)
   {
     QHash<QString, QmitkRenderWindow*> renderWindows = this->GetRenderWindowPart()->GetQmitkRenderWindows();
 
     Q_FOREACH(QString renderWindow, renderWindows.keys())
     {
       m_Controls.propertyListComboBox->insertItem(m_Controls.propertyListComboBox->count() - 1, QString("Data node: ") + renderWindow);
     }
   }
 }
 
 void QmitkPropertyTreeView::RenderWindowPartDeactivated(mitk::IRenderWindowPart*)
 {
   if (m_Controls.propertyListComboBox->count() > 2)
   {
     m_Controls.propertyListComboBox->clear();
     m_Controls.propertyListComboBox->addItem("Data node: common");
     m_Controls.propertyListComboBox->addItem("Base data");
   }
 }
 
 void QmitkPropertyTreeView::OnPropertyListChanged(int index)
 {
   if (index == -1)
     return;
 
   QString renderer = m_Controls.propertyListComboBox->itemText(index);
 
   if (renderer.startsWith("Data node: "))
     renderer = QString::fromStdString(renderer.toStdString().substr(11));
 
   m_Renderer = renderer != "common" && renderer != "Base data"
     ? this->GetRenderWindowPart()->GetQmitkRenderWindow(renderer)->GetRenderer()
     : NULL;
 
   QList<mitk::DataNode::Pointer> nodes;
 
   if (m_SelectedNode.IsNotNull())
     nodes << m_SelectedNode;
 
   berry::IWorkbenchPart::Pointer workbenchPart;
 
   this->OnSelectionChanged(workbenchPart, nodes);
 }
 
 void QmitkPropertyTreeView::OnAddNewProperty()
 {
   std::unique_ptr<QmitkAddNewPropertyDialog> dialog(m_Controls.propertyListComboBox->currentText() != "Base data"
       ? new QmitkAddNewPropertyDialog(m_SelectedNode, m_Renderer, m_Parent)
       : new QmitkAddNewPropertyDialog(m_SelectedNode->GetData()));
 
   if (dialog->exec() == QDialog::Accepted)
     this->m_Model->Update();
 }
diff --git a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.h b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.h
index 500f81e06a..d1f2f2eaf9 100644
--- a/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.h
+++ b/Plugins/org.mitk.gui.qt.properties/src/internal/QmitkPropertyTreeView.h
@@ -1,84 +1,87 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef QmitkPropertyTreeView_h
 #define QmitkPropertyTreeView_h
 
 #include <mitkDataNode.h>
 #include <mitkIRenderWindowPartListener.h>
 #include <QmitkAbstractView.h>
 #include <ui_QmitkPropertyTreeView.h>
 
 class QmitkPropertyItemDelegate;
 class QmitkPropertyItemModel;
 class QmitkPropertyItemSortFilterProxyModel;
 
 namespace mitk
 {
   class IPropertyAliases;
   class IPropertyDescriptions;
+  class IPropertyPersistence;
 }
 
 class QmitkPropertyTreeView : public QmitkAbstractView, public mitk::IRenderWindowPartListener
 {
   Q_OBJECT
 
 public:
   static const std::string VIEW_ID;
 
   berryObjectMacro(QmitkPropertyTreeView);
 
   QmitkPropertyTreeView();
   ~QmitkPropertyTreeView();
 
   void SetFocus() override;
 
   void RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart) override;
   void RenderWindowPartDeactivated(mitk::IRenderWindowPart*) override;
 
 protected:
   void CreateQtPartControl(QWidget* parent) override;
 
 private:
   QString GetPropertyNameOrAlias(const QModelIndex& index);
   void OnPreferencesChanged(const berry::IBerryPreferences* preferences) override;
   void OnPropertyNameChanged(const itk::EventObject& event);
   void OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList<mitk::DataNode::Pointer>& nodes) override;
 
 private slots:
   void OnCurrentRowChanged(const QModelIndex& current, const QModelIndex& previous);
   void OnPropertyListChanged(int index);
   void OnAddNewProperty();
   void OnFilterTextChanged(const QString& filter);
   void OnModelReset();
 
 private:
   QWidget* m_Parent;
   unsigned long m_PropertyNameChangedTag;
   std::string m_SelectionClassName;
   mitk::IPropertyAliases* m_PropertyAliases;
   mitk::IPropertyDescriptions* m_PropertyDescriptions;
+  mitk::IPropertyPersistence* m_PropertyPersistence;
   bool m_ShowAliasesInDescription;
+  bool m_ShowPersistenceInDescription;
   bool m_DeveloperMode;
   Ui::QmitkPropertyTreeView m_Controls;
   QmitkPropertyItemSortFilterProxyModel* m_ProxyModel;
   QmitkPropertyItemModel* m_Model;
   QmitkPropertyItemDelegate* m_Delegate;
   mitk::DataNode::Pointer m_SelectedNode;
   mitk::BaseRenderer* m_Renderer;
 };
 
 #endif