diff --git a/Modules/IGT/Testing/mitkNavigationDataObjectVisualizationFilterTest.cpp b/Modules/IGT/Testing/mitkNavigationDataObjectVisualizationFilterTest.cpp
index 07eadb16cb..34dd0a5dc8 100644
--- a/Modules/IGT/Testing/mitkNavigationDataObjectVisualizationFilterTest.cpp
+++ b/Modules/IGT/Testing/mitkNavigationDataObjectVisualizationFilterTest.cpp
@@ -1,437 +1,462 @@
 /*===================================================================
 
 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 "mitkNavigationDataObjectVisualizationFilter.h"
 #include "mitkNavigationData.h"
 
 #include "mitkTestingMacros.h"
 #include <mitkTestingConfig.h>
 #include <mitkTestFixture.h>
 
 #include <vtkTransform.h>
 #include <iostream>
 
 #include "mitkSurface.h"
 
 /**Documentation
 *  test for the class "NavigationDataObjectVisualizationFilter".
 */
 class mitkNavigationDataObjectVisualizationFilterTestSuite : public mitk::TestFixture
 {
   // List of Tests
   CPPUNIT_TEST_SUITE(mitkNavigationDataObjectVisualizationFilterTestSuite);
 
   //Constructor
   MITK_TEST(TestInitialize);
   MITK_TEST(TestInput);
   MITK_TEST(TestOutput);
   MITK_TEST(TestRepresentationObjects);
   MITK_TEST(TestTransforms);
   MITK_TEST(TestMessWithRepresentationObjects);
   MITK_TEST(TestThirdInput);
   MITK_TEST(TestSetTransformPosition);
   MITK_TEST(TestSetTransformOrientation);
   MITK_TEST(TestConvenienceSetTransformOrientation);
   MITK_TEST(TestUpdateOrientation);
 
   CPPUNIT_TEST_SUITE_END();
 
   // Used Variables
 private:
   mitk::NavigationDataObjectVisualizationFilter::Pointer myFilter;
   mitk::NavigationData::PositionType initialPos1, initialPos2;
   mitk::NavigationData::OrientationType initialOri1;
   mitk::NavigationData::OrientationType initialOri2;
   mitk::ScalarType initialError1;
   mitk::ScalarType initialError2;
   bool initialValid1;
   bool initialValid2;
   mitk::NavigationData::Pointer nd1;
   mitk::NavigationData::Pointer nd2;
 
   // Test setting BaseData
-  mitk::Surface::Pointer mitkToolData1 ;
-
-  mitk::Surface::Pointer mitkToolData2 ;
+  mitk::Surface::Pointer mitkToolData1;
+  std::vector<mitk::BaseData::Pointer> mitkToolVectorData1;
+  mitk::Surface::Pointer mitkToolData2;
+  std::vector<mitk::BaseData::Pointer> mitkToolVectorData2;
 
   //dummy for test; will not be set but used to test find
-  mitk::Surface::Pointer mitkToolDataDummy ;
+  mitk::Surface::Pointer mitkToolDataDummy;
+  std::vector<mitk::BaseData::Pointer> mitkToolVectorDataDummy;
   //and the Dummy NavigationData for this
   mitk::NavigationData::OrientationType initialOriDummy;
   mitk::NavigationData::PositionType initialPosDummy;
   mitk::ScalarType initialErrorDummy;
   bool initialValidDummy;
   mitk::NavigationData::Pointer ndDummy ;
 
   mitk::NavigationData* output;
 
   mitk::AffineTransform3D::Pointer affineTransform1;
   mitk::AffineTransform3D::OutputVectorType offset1;
 
   mitk::AffineTransform3D::Pointer affineTransform2;
   mitk::AffineTransform3D::OutputVectorType offset2;
   mitk::AffineTransform3D::MatrixType::InternalMatrixType m1;
   mitk::AffineTransform3D::MatrixType::InternalMatrixType m2;
 
 public:
 
   // Set up for variables
   void setUp() override
   {
     // -------------- Setup for Filter ---------------------------
 
     /* create helper objects: navigation data with position as origin, zero quaternion, zero error and data valid */
     myFilter = mitk::NavigationDataObjectVisualizationFilter::New();
     mitk::FillVector3D(initialPos1, 1.1, 2.2, 3.3);
     mitk::FillVector3D(initialPos2, 5.0, 6.0, 7.0);
     mitk::FillVector4D(initialOri1, 0.1, 0.2, 0.3, 0.4);
     mitk::FillVector4D(initialOri2,0.5, 0.6, 0.7, 0.8);
     initialError1=0.0;
     initialError2=5.0;
     initialValid1 = true;
     initialValid2 = true;
 
     //Set Navigation Data
     nd1 = mitk::NavigationData::New();
     nd1->SetPosition(initialPos1);
     nd1->SetOrientation(initialOri1);
     nd1->SetPositionAccuracy(initialError1);
     nd1->SetDataValid(initialValid1);
 
     nd2 = mitk::NavigationData::New();
     nd2->SetPosition(initialPos2);
     nd2->SetOrientation(initialOri2);
     nd2->SetPositionAccuracy(initialError2);
     nd2->SetDataValid(initialValid2);
 
     //Set Input
     myFilter->SetInput(nd1);
     myFilter->SetInput(1, nd2);
     output = myFilter->GetOutput();
 
     // -------------------------- Setup for TestData ----------------------
 
     // Test setting BaseData
     mitkToolData1 = mitk::Surface::New();
     mitkToolData2 = mitk::Surface::New();
 
+    // Test setting BaseData vectors
+    mitkToolVectorData1.push_back(mitkToolData1.GetPointer());
+    mitkToolVectorData2.push_back(mitkToolData2.GetPointer());
+
     //dummy for test; will not be set but used to test find
     mitkToolDataDummy = mitk::Surface::New();
+    mitkToolVectorDataDummy.push_back(mitkToolDataDummy.GetPointer());
     //and the Dummy NavigationData for this
     mitk::FillVector3D(initialPosDummy, 8.8, 9.9, 10.10);
     mitk::FillVector4D(initialOriDummy,1.1, 2.2, 3.3, 4.4);
     initialErrorDummy=10.0;
     initialValidDummy=true;
     ndDummy = mitk::NavigationData::New();
     ndDummy->SetPosition(initialPosDummy);
     ndDummy->SetOrientation(initialOriDummy);
     ndDummy->SetPositionAccuracy(initialErrorDummy);
     ndDummy->SetDataValid(initialValidDummy);
     //now we have ndDummy and mitkToolDataDummy to test with
   }
 
   void tearDown() override
   {
   }
 
   // Test functions
 
   void TestInitialize(){
     // first test: did this work?
     CPPUNIT_ASSERT_MESSAGE("Testing instantiation", myFilter.IsNotNull());
   }
 
   void TestInput(){
     //testing the input
     CPPUNIT_ASSERT_MESSAGE("Testing Set-/GetInput() input 1 without index",myFilter->GetInput() == nd1);
     CPPUNIT_ASSERT_MESSAGE("Testing Set-/GetInput() input 1", myFilter->GetInput(0) == nd1);
     CPPUNIT_ASSERT_MESSAGE( "Testing Set-/GetInput() input 2", myFilter->GetInput(1) == nd2);
     CPPUNIT_ASSERT_MESSAGE("Testing GetNumberOfToolRepresentations()", myFilter->GetNumberOfToolRepresentations() == 0);
   }
 
   void TestOutput(){
     //testing getting the output
     CPPUNIT_ASSERT_MESSAGE("Testing GetOutput()", output != nullptr);
     CPPUNIT_ASSERT_MESSAGE("Testing GetOutput() == GetOutput()", output == myFilter->GetOutput());
     CPPUNIT_ASSERT_MESSAGE("Testing GetOutput() != GetOutput(1)", output != myFilter->GetOutput(1));
   }
 
   void TestRepresentationObjects(){
     //setting nodes
-    myFilter->SetRepresentationObject(0, mitkToolData1);
+    myFilter->SetRepresentationObject(0, mitkToolData1.GetPointer());
     CPPUNIT_ASSERT_MESSAGE( "Testing SetRepresentationObject()/GetRepresentationObject() node 1", myFilter->GetRepresentationObject(0) == mitkToolData1);
     CPPUNIT_ASSERT_MESSAGE("Testing GetNumberOfToolRepresentations() after adding first tool", myFilter->GetNumberOfToolRepresentations() == 1);
 
-    myFilter->SetRepresentationObject(1, mitkToolData2);
+    myFilter->SetRepresentationObject(1, mitkToolData2.GetPointer());
     CPPUNIT_ASSERT_MESSAGE( "Testing SetRepresentationObject() node 2", myFilter->GetRepresentationObject(1) == mitkToolData2);
     CPPUNIT_ASSERT_MESSAGE( "Testing GetNumberOfToolRepresentations() after adding second tool", myFilter->GetNumberOfToolRepresentations() == 2);
     //getting nodes
     CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() node 1", myFilter->GetRepresentationObject(0) == mitkToolData1);
     CPPUNIT_ASSERT_MESSAGE( "Testing GetRepresentationObject() != Dummy node", myFilter->GetRepresentationObject(0) != mitkToolDataDummy);
     CPPUNIT_ASSERT_MESSAGE( "Testing GetRepresentationObject() node 2", myFilter->GetRepresentationObject(1) == mitkToolData2);
     CPPUNIT_ASSERT_MESSAGE( "Testing GetRepresentationObject() != Dummy node", myFilter->GetRepresentationObject(1) != mitkToolDataDummy);
     CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() with out of range parameter", myFilter->GetRepresentationObject(111) == nullptr);
   }
 
+  void TestAllRepresentationObjects()
+  {
+    // setting nodes
+    myFilter->SetRepresentationObjects(0, mitkToolVectorData1);
+    CPPUNIT_ASSERT_MESSAGE("Testing SetRepresentationObject()/GetRepresentationObject() node 1", myFilter->GetAllRepresentationObjects(0) == mitkToolVectorData1);
+    CPPUNIT_ASSERT_MESSAGE("Testing GetNumberOfToolRepresentations() after adding first tool", myFilter->GetNumberOfToolRepresentations() == 1);
+
+    myFilter->SetRepresentationObjects(1, mitkToolVectorData2);
+    CPPUNIT_ASSERT_MESSAGE("Testing SetRepresentationObject() node 2", myFilter->GetAllRepresentationObjects(1) == mitkToolVectorData2);
+    CPPUNIT_ASSERT_MESSAGE("Testing GetNumberOfToolRepresentations() after adding second tool", myFilter->GetNumberOfToolRepresentations() == 2);
+    // getting nodes
+    CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() node 1", myFilter->GetAllRepresentationObjects(0) == mitkToolVectorData1);
+    CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() != Dummy node", myFilter->GetAllRepresentationObjects(0) != mitkToolVectorDataDummy);
+    CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() node 2", myFilter->GetAllRepresentationObjects(1) == mitkToolVectorData2);
+    CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() != Dummy node", myFilter->GetAllRepresentationObjects(1) != mitkToolVectorDataDummy);
+    CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() with out of range parameter", myFilter->GetAllRepresentationObjects(111).empty() == true);
+  }
+
   void TestTransforms(){
-    myFilter->SetRepresentationObject(0, mitkToolData1);
-    myFilter->SetRepresentationObject(1, mitkToolData2);
+    myFilter->SetRepresentationObject(0, mitkToolData1.GetPointer());
+    myFilter->SetRepresentationObject(1, mitkToolData2.GetPointer());
     //Process
     myFilter->Update();
 
     affineTransform1 = mitkToolData1->GetGeometry()->GetIndexToWorldTransform();
     offset1 = affineTransform1->GetOffset();
     affineTransform2 = mitkToolData2->GetGeometry()->GetIndexToWorldTransform();
     offset2 = affineTransform2->GetOffset();
 
     m1 = affineTransform1->GetMatrix().GetVnlMatrix();
     m2 = affineTransform2->GetMatrix().GetVnlMatrix();
 
     //now check it there are data connected to the nodes with the according orientation and offsets
     CPPUNIT_ASSERT_MESSAGE("Testing Offset position 1", offset1.GetVnlVector()==initialPos1.GetVnlVector());
     CPPUNIT_ASSERT_MESSAGE("Testing Offset position 2", offset2.GetVnlVector()==initialPos2.GetVnlVector());
 
     MITK_TEST_OUTPUT( << "\n initOrient1="<<initialOri1<<" affineTransform1->GetVnlMatrix():\n "<< m1);
     MITK_TEST_OUTPUT( << "\n initOrient2=" << initialOri2 << " affineTransform2->GetVnlMatrix():\n " << m2);
   }
 
   void TestMessWithRepresentationObjects(){
-    myFilter->SetRepresentationObject(0, mitkToolData1);
-    myFilter->SetRepresentationObject(1, mitkToolData2);
+    myFilter->SetRepresentationObject(0, mitkToolData1.GetPointer());
+    myFilter->SetRepresentationObject(1, mitkToolData2.GetPointer());
     //Process
     myFilter->Update();
 
     affineTransform1 = mitkToolData1->GetGeometry()->GetIndexToWorldTransform();
     offset1 = affineTransform1->GetOffset();
     affineTransform2 = mitkToolData2->GetGeometry()->GetIndexToWorldTransform();
     offset2 = affineTransform2->GetOffset();
 
     m1 = affineTransform1->GetMatrix().GetVnlMatrix();
     m2 = affineTransform2->GetMatrix().GetVnlMatrix();
 
     //messing with SetRepresentationObject
     //setting nodes
-    myFilter->SetRepresentationObject(0, mitkToolData2);
+    myFilter->SetRepresentationObject(0, mitkToolData2.GetPointer());
     CPPUNIT_ASSERT_MESSAGE("Twisting mitkToolData by using SetRepresentationObject() NavigationData 1 with ToolData 2", myFilter->GetRepresentationObject(0) == mitkToolData2);
     CPPUNIT_ASSERT_MESSAGE( "Testing GetNumberOfToolRepresentations() == 1", myFilter->GetNumberOfToolRepresentations() == 2);
 
-    myFilter->SetRepresentationObject(1, mitkToolData1);
+    myFilter->SetRepresentationObject(1, mitkToolData1.GetPointer());
     CPPUNIT_ASSERT_MESSAGE("Twisting mitkToolData by using SetRepresentationObject() NavigationData 2 with ToolData 1", myFilter->GetRepresentationObject(1) == mitkToolData1);
     CPPUNIT_ASSERT_MESSAGE( "Testing GetNumberOfToolRepresentations() == 2", myFilter->GetNumberOfToolRepresentations() == 2);
 
     //getting nodes
     CPPUNIT_ASSERT_MESSAGE("Testing switched BaseData of NavigationData 1 ", myFilter->GetRepresentationObject(0) == mitkToolData2);
     CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() != Dummy node", myFilter->GetRepresentationObject(0) != mitkToolDataDummy);
     CPPUNIT_ASSERT_MESSAGE("Testing switched BaseData NavigationData 2", myFilter->GetRepresentationObject(1) == mitkToolData1);
     CPPUNIT_ASSERT_MESSAGE("Testing GetRepresentationObject() != Dummy node", myFilter->GetRepresentationObject(1) != mitkToolDataDummy);
 
     //processing update through pipeline
     myFilter->Update();
 
     //now check it there are data connected to the nodes with the according orientation and offsets
     mitk::AffineTransform3D::Pointer affineTransform1Second = mitkToolData1->GetGeometry()->GetIndexToWorldTransform();
     CPPUNIT_ASSERT_MESSAGE( "Testing affineTransform1 after second update", affineTransform1 == affineTransform1Second);
     mitk::AffineTransform3D::OutputVectorType offset1Second = affineTransform1->GetOffset();
     CPPUNIT_ASSERT_MESSAGE( "Testing offset1 after second update", offset1 == offset1Second);
     CPPUNIT_ASSERT_MESSAGE("Testing offset1 equals first update", offset1Second.GetVnlVector()==offset1.GetVnlVector());
 
     mitk::AffineTransform3D::Pointer affineTransform2Second = mitkToolData2->GetGeometry()->GetIndexToWorldTransform();
     CPPUNIT_ASSERT_MESSAGE("Testing affineTransform2 after second update", affineTransform2 == affineTransform2Second);
     mitk::AffineTransform3D::OutputVectorType offset2Second = affineTransform2->GetOffset();
     CPPUNIT_ASSERT_MESSAGE("Testing offset2 after second update", offset2 == offset2Second);
     CPPUNIT_ASSERT_MESSAGE("Testing offset2 equals first update", offset2Second.GetVnlVector()==offset2.GetVnlVector());
 
     mitk::AffineTransform3D::MatrixType::InternalMatrixType m1Second= affineTransform1Second->GetMatrix().GetVnlMatrix();
     MITK_TEST_OUTPUT( <<"\n after second update initOrient1="<<initialOri1<<" affineTransform1->GetVnlMatrix():\n "<< m1Second);
 
     mitk::AffineTransform3D::MatrixType::InternalMatrixType m2Second= affineTransform2Second->GetMatrix().GetVnlMatrix();
     MITK_TEST_OUTPUT( << "\n after second update initOrient2="<<initialOri2<<" affineTransform2->GetVnlMatrix():\n "<< m2Second);
   }
 
   void TestThirdInput(){
-    myFilter->SetRepresentationObject(0, mitkToolData1);
-    myFilter->SetRepresentationObject(1, mitkToolData2);
+    myFilter->SetRepresentationObject(0, mitkToolData1.GetPointer());
+    myFilter->SetRepresentationObject(1, mitkToolData2.GetPointer());
     //Process
     myFilter->Update();
 
     //testing adding a third input
     myFilter->SetInput(2,ndDummy);
     CPPUNIT_ASSERT_MESSAGE("Adding new input and testing GetNumberOfInputs == 3", myFilter->GetNumberOfInputs() == 3);
     CPPUNIT_ASSERT_MESSAGE("testing GetNumberOfOutputs == 3", myFilter->GetNumberOfOutputs() == 3);
     CPPUNIT_ASSERT_MESSAGE("Testing Input == newly added input", myFilter->GetInput(2) == ndDummy);
     CPPUNIT_ASSERT_MESSAGE("Testing GetOutput(2) != nullptr", myFilter->GetOutput(2) != nullptr);
     CPPUNIT_ASSERT_MESSAGE( "Testing GetOutput(2) != GetOutput(1)", myFilter->GetOutput(2) != myFilter->GetOutput(1));
-    myFilter->SetRepresentationObject(2, mitkToolDataDummy);
+    myFilter->SetRepresentationObject(2, mitkToolDataDummy.GetPointer());
     CPPUNIT_ASSERT_MESSAGE("Testing GetNumberOfToolRepresentations() after adding latest tool", myFilter->GetNumberOfToolRepresentations() == 3);
     CPPUNIT_ASSERT_MESSAGE("Testing Set-/GetRepresentationObject() equals was set", myFilter->GetRepresentationObject(2) == mitkToolDataDummy);
 
     //last time processing update through pipeline
     myFilter->Update();
 
     //now check for the new values
     mitk::AffineTransform3D::Pointer affineTransformDummy = mitkToolDataDummy->GetGeometry()->GetIndexToWorldTransform();
     mitk::AffineTransform3D::OutputVectorType offsetDummy = affineTransformDummy->GetOffset();
     CPPUNIT_ASSERT_MESSAGE("Testing Offset latest added tool", offsetDummy.GetVnlVector()==initialPosDummy.GetVnlVector());
 
     mitk::AffineTransform3D::MatrixType::InternalMatrixType m1Latest= affineTransformDummy->GetMatrix().GetVnlMatrix();
     MITK_TEST_OUTPUT( << "\n latest initOrient="<<initialOriDummy<<" latest affineTransform->GetVnlMatrix():\n "<< m1Latest);
 
     mitk::Surface::Pointer anotherSurface = mitk::Surface::New();
-    myFilter->SetRepresentationObject(0, anotherSurface);
+    myFilter->SetRepresentationObject(0, anotherSurface.GetPointer());
     CPPUNIT_ASSERT_MESSAGE("Overwriting BaseData index 0", myFilter->GetRepresentationObject(0) == anotherSurface);
   }
 
   void TestSetTransformPosition(){
     // test Set/GetTransformPosition()
     myFilter->SetTransformPosition(0,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(0,true)", myFilter->GetTransformPosition(0)==true);
     myFilter->SetTransformPosition(1,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(1,true)", myFilter->GetTransformPosition(1)==true);
     myFilter->SetTransformPosition(2,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(2,true)", myFilter->GetTransformPosition(2)==true);
     myFilter->SetTransformPosition(3,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(3,true)", myFilter->GetTransformPosition(3)==true);
 
     myFilter->SetTransformPosition(0,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(0,false)", myFilter->GetTransformPosition(0)==false);
     myFilter->SetTransformPosition(1,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(1,false)", myFilter->GetTransformPosition(1)==false);
     myFilter->SetTransformPosition(2,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(2,false)", myFilter->GetTransformPosition(2)==false);
     myFilter->SetTransformPosition(3,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformPosition(3,false)", myFilter->GetTransformPosition(3)==false);
   }
 
   void TestSetTransformOrientation(){
     // test Set/GetTransformOrientation()
     myFilter->SetTransformOrientation(0,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(0,true)", myFilter->GetTransformOrientation(0)==true);
     myFilter->SetTransformOrientation(1,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(1,true)", myFilter->GetTransformOrientation(1)==true);
     myFilter->SetTransformOrientation(2,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(2,true)", myFilter->GetTransformOrientation(2)==true);
     myFilter->SetTransformOrientation(3,true);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(3,true)", myFilter->GetTransformOrientation(3)==true);
 
     myFilter->SetTransformOrientation(0,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(0,false)", myFilter->GetTransformOrientation(0)==false);
     myFilter->SetTransformOrientation(1,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(1,false)", myFilter->GetTransformOrientation(1)==false);
     myFilter->SetTransformOrientation(2,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(2,false)", myFilter->GetTransformOrientation(2)==false);
     myFilter->SetTransformOrientation(3,false);
     CPPUNIT_ASSERT_MESSAGE("test Set/GetTransformOrientation(3,false)", myFilter->GetTransformOrientation(3)==false);
   }
 
   void TestConvenienceSetTransformOrientation(){
     // test the convenience methods to set/getTransformOrientation/Position
     myFilter->TransformOrientationOn(0);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOn()", myFilter->GetTransformOrientation(0)==true);
     myFilter->TransformOrientationOff(0);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOff()", myFilter->GetTransformOrientation(0)==false);
     myFilter->TransformOrientationOff(1);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOff()", myFilter->GetTransformOrientation(1)==false);
     myFilter->TransformOrientationOn(1);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOn()", myFilter->GetTransformOrientation(1)==true);
     myFilter->TransformOrientationOn(2);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOn()", myFilter->GetTransformOrientation(2)==true);
     myFilter->TransformOrientationOff(2);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOff()", myFilter->GetTransformOrientation(2)==false);
     myFilter->TransformOrientationOn(3);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOn()", myFilter->GetTransformOrientation(3)==true);
     myFilter->TransformOrientationOff(3);
     CPPUNIT_ASSERT_MESSAGE("test TransformOrientationOff()", myFilter->GetTransformOrientation(3)==false);
 
     myFilter->TransformPositionOn(0);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOn()", myFilter->GetTransformPosition(0)==true);
     myFilter->TransformPositionOff(0);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOff()", myFilter->GetTransformPosition(0)==false);
     myFilter->TransformPositionOff(1);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOff()", myFilter->GetTransformPosition(1)==false);
     myFilter->TransformPositionOn(1);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOn()", myFilter->GetTransformPosition(1)==true);
     myFilter->TransformPositionOn(2);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOn()", myFilter->GetTransformPosition(2)==true);
     myFilter->TransformPositionOff(2);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOff()", myFilter->GetTransformPosition(2)==false);
     myFilter->TransformPositionOn(3);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOn()", myFilter->GetTransformPosition(3)==true);
     myFilter->TransformPositionOff(3);
     CPPUNIT_ASSERT_MESSAGE("test TransformPositionOff()", myFilter->GetTransformPosition(3)==false);
   }
 
   void TestUpdateOrientation(){
     // update position and orientation
     mitk::NavigationData::PositionType updatedPos1, updatedPos2, zero;
     mitk::FillVector3D(updatedPos1, 3.2, 1.5, 2.8);
     mitk::FillVector3D(updatedPos2, 4.3, 5.2, 6.0);
     mitk::FillVector3D(zero, 0.0, 0.0, 0.0);
     mitk::NavigationData::OrientationType updatedOri1(0.7, 0.5, 0.1, 0.4);
     mitk::NavigationData::OrientationType updatedOri2(0.2, 0.7, 0.6, 0.1);
 
     updatedOri1.normalize();
     updatedOri2.normalize();
 
     nd1->SetPosition(updatedPos1);
     nd1->SetOrientation(updatedOri1);
 
     nd2->SetPosition(updatedPos2);
     nd2->SetOrientation(updatedOri2);
 
-    myFilter->SetRepresentationObject(0,mitkToolData1);
-    myFilter->SetRepresentationObject(1,mitkToolData2);
+    myFilter->SetRepresentationObject(0, mitkToolData1.GetPointer());
+    myFilter->SetRepresentationObject(1, mitkToolData2.GetPointer());
 
     myFilter->TransformPositionOn(0);
     myFilter->TransformOrientationOff(0);
     myFilter->TransformPositionOff(1);
     myFilter->TransformOrientationOn(1);
 
     myFilter->Update();
 
     // test positions and orientations
     mitk::AffineTransform3D::Pointer updatedAffineTransform1 = mitkToolData1->GetGeometry()->GetIndexToWorldTransform();
     mitk::AffineTransform3D::OutputVectorType updatedOffset1 = updatedAffineTransform1->GetOffset();
     CPPUNIT_ASSERT_MESSAGE("Testing updated position 1", mitk::Equal(updatedOffset1.GetVnlVector(),updatedPos1.GetVnlVector()));
 
     mitk::AffineTransform3D::Pointer updatedAffineTransform2 = mitkToolData2->GetGeometry()->GetIndexToWorldTransform();
     mitk::AffineTransform3D::OutputVectorType updatedOffset2 = updatedAffineTransform2->GetOffset();
     CPPUNIT_ASSERT_MESSAGE( "Testing updated position 2", mitk::Equal(updatedOffset2.GetVnlVector(),zero.GetVnlVector()));
 
     mitk::AffineTransform3D::Pointer identityTransform = mitk::AffineTransform3D::New();
     identityTransform->SetIdentity();
     mitk::AffineTransform3D::MatrixType identityMatrix = identityTransform->GetMatrix();
     mitk::AffineTransform3D::MatrixType uM1 = updatedAffineTransform1->GetMatrix();
 
     CPPUNIT_ASSERT_MESSAGE( "Testing updated orientation 1", mitk::MatrixEqualElementWise(uM1, identityMatrix));
 
     mitk::AffineTransform3D::MatrixType::InternalMatrixType uM2 = updatedAffineTransform2->GetMatrix().GetVnlMatrix();
     mitk::AffineTransform3D::MatrixType::InternalMatrixType updatedOriTransform2 = updatedOri2.rotation_matrix_transpose().transpose();
 
     CPPUNIT_ASSERT_MESSAGE("Testing updated orientation 2", mitk::MatrixEqualElementWise(uM2,updatedOriTransform2));
 
     // Test that the second RepresentationObject is updated properly even when
     // the first RepresentationObject is invalid
     nd2->Modified();
     myFilter->SetRepresentationObject(0, nullptr);
     mitkToolData2->GetGeometry()->SetIdentity();
     myFilter->Update();
     CPPUNIT_ASSERT_MESSAGE( "Test that the second repr object is updated correctly when the first repr object is invalid",
       mitk::MatrixEqualElementWise(mitkToolData2->GetGeometry()->GetIndexToWorldTransform()->GetMatrix().GetVnlMatrix(),
       updatedOri2.rotation_matrix_transpose().transpose()));
   }
 };//end class mitkNavigationDataObjectVisualizationFilterTestSuite
 
 MITK_TEST_SUITE_REGISTRATION(mitkNavigationDataObjectVisualizationFilter)
diff --git a/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp
index 6cc68441e8..2754611789 100644
--- a/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp
+++ b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp
@@ -1,239 +1,239 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 // Qmitk
 #include "QmitkNavigationDataPlayerView.h"
 
 // QT
 #include <QFileDialog>
 #include <QMessageBox>
 
 //mitk
 #include <mitkNavigationDataSet.h>
 #include <mitkNavigationDataReaderInterface.h>
 #include <mitkNavigationDataSequentialPlayer.h>
 #include <mitkNavigationDataPlayer.h>
 #include <mitkVirtualTrackingTool.h>
 #include <mitkIOUtil.h>
 
 // VTK
 #include <vtkSphereSource.h>
 
 const std::string QmitkNavigationDataPlayerView::VIEW_ID = "org.mitk.views.navigationdataplayer";
 
 QmitkNavigationDataPlayerView::QmitkNavigationDataPlayerView()
   : m_Controls( 0 )
 {
 }
 
 QmitkNavigationDataPlayerView::~QmitkNavigationDataPlayerView()
 {
 }
 
 void QmitkNavigationDataPlayerView::CreateQtPartControl( QWidget *parent )
 {
   // build up qt view, unless already done
   if ( !m_Controls )
   {
     // create GUI widgets from the Qt Designer's .ui file
     m_Controls = new Ui::QmitkNavigationDataPlayerViewControls;
     m_Controls->setupUi( parent );
 
     this->CreateConnections();
 
     // make deselected Player invisible
     m_Controls->m_TimedWidget->setVisible(false);
   }
 }
 
 void QmitkNavigationDataPlayerView::SetFocus()
 {
   if ( m_Controls )
   {
     m_Controls->m_grpbxControls->setFocus();
   }
 }
 
 void QmitkNavigationDataPlayerView::CreateConnections()
 {
   connect( m_Controls->m_RdbSequential, SIGNAL(released()), this, SLOT(OnSelectPlayer()) );
   connect( m_Controls->m_RdbTimeBased, SIGNAL(released()), this, SLOT(OnSelectPlayer()) );
   connect( m_Controls->m_BtnOpenFile, SIGNAL(released()), this, SLOT(OnOpenFile()) );
   connect( m_Controls->m_ChkDisplay, SIGNAL(released()), this, SLOT(OnSetDisplay()) );
   connect( m_Controls->m_chkRepeat, SIGNAL(stateChanged(int)), this, SLOT(OnSetRepeat(int)) );
   connect( m_Controls->m_ChkMicroservice, SIGNAL(released()), this, SLOT(OnSetMicroservice()) );
 
   connect( m_Controls->m_SequentialWidget, SIGNAL(SignalUpdate()), this, SLOT(OnUpdate()) );
   connect( m_Controls->m_TimedWidget, SIGNAL(SignalUpdate()), this, SLOT(OnUpdate()) );
 
   this->SetInteractionComponentsEnabledState(false);
 }
 
 void QmitkNavigationDataPlayerView::OnOpenFile()
 {
   mitk::NavigationDataReaderInterface::Pointer reader = nullptr;
 
   QString filter = tr("NavigationData File (*.csv *.xml)");
 
   QString fileName = QFileDialog::getOpenFileName(nullptr, tr("Open NavigationData Set"), "", filter);
 
   if ( fileName.isNull() ) { return; } // user pressed cancel
 
   try
   {
     m_Data = dynamic_cast<mitk::NavigationDataSet*> (mitk::IOUtil::Load(fileName.toStdString())[0].GetPointer());
   }
   catch ( const mitk::Exception &e )
   {
     MITK_WARN("NavigationDataPlayerView") << "could not open file " << fileName.toStdString();
     QMessageBox::critical(0, "Error Reading File", "The file '" + fileName
                           +"' could not be read.\n" + e.GetDescription() );
     return;
   }
 
   if (m_Controls->m_ChkConvertToPointSet->isChecked())
     m_Data->ConvertNavigationDataToPointSet();
 
   // Update Labels
   m_Controls->m_LblFilePath->setText(fileName);
   m_Controls->m_LblFrames->setText(QString::number(m_Data->Size()));
   m_Controls->m_LblTools->setText(QString::number(m_Data->GetNumberOfTools()));
 
   // Initialize Widgets and create Player
   this->OnSelectPlayer();
   this->SetInteractionComponentsEnabledState(true);
 }
 
 void QmitkNavigationDataPlayerView::OnSelectPlayer()
 {
   if (m_Controls->m_RdbSequential->isChecked())
   {
     m_Controls->m_SequentialWidget->setVisible(true);
     m_Controls->m_TimedWidget->setVisible(false);
     mitk::NavigationDataSequentialPlayer::Pointer seqPlayer = mitk::NavigationDataSequentialPlayer::New();
     seqPlayer->SetNavigationDataSet(m_Data);
     m_Controls->m_SequentialWidget->SetPlayer(seqPlayer);
     m_Player = seqPlayer;
   } else {
     m_Controls->m_SequentialWidget->setVisible(false);
     m_Controls->m_TimedWidget->setVisible(true);
     mitk::NavigationDataPlayer::Pointer timedPlayer = mitk::NavigationDataPlayer::New();
     timedPlayer->SetNavigationDataSet(m_Data);
     m_Controls->m_TimedWidget->SetPlayer(timedPlayer);
     m_Player = timedPlayer;
   }
 
   this->ConfigurePlayer();
 
   // SetupRenderingPipeline
   this->OnSetDisplay();
 }
 
 void QmitkNavigationDataPlayerView::ConfigurePlayer()
 {
   // set repeat mode according to the checkbox
   m_Player->SetRepeat( m_Controls->m_chkRepeat->isChecked() );
 }
 
 void QmitkNavigationDataPlayerView::OnSetRepeat(int checkState)
 {
   m_Player->SetRepeat(checkState != 0);
 }
 
 void QmitkNavigationDataPlayerView::OnSetMicroservice(){
   if(m_Controls->m_ChkMicroservice->isChecked())
   {
     m_ToolStorage = mitk::NavigationToolStorage::New();
     for (itk::ProcessObject::DataObjectPointerArraySizeType i = 0;
          i < m_Player->GetNumberOfIndexedOutputs(); i++)
     {
       mitk::NavigationTool::Pointer currentDummyTool = mitk::NavigationTool::New();
       mitk::VirtualTrackingTool::Pointer dummyTool = mitk::VirtualTrackingTool::New();
       std::stringstream name;
       name << "Virtual Tool " << i;
       dummyTool->SetToolName(name.str());
       currentDummyTool->SetDataNode(m_RenderingNodes.at(i));
       currentDummyTool->SetIdentifier(name.str());
       m_ToolStorage->AddTool(currentDummyTool);
     }
     m_Player->RegisterAsMicroservice();
     m_ToolStorage->SetName("NavigationDataPlayer Tool Storage");
     m_ToolStorage->SetSourceID(m_Player->GetMicroserviceID());
     m_ToolStorage->RegisterAsMicroservice();
   } else {
     if (m_ToolStorage.IsNotNull()) m_ToolStorage->UnRegisterMicroservice();
     m_ToolStorage = nullptr;
     m_Player->UnRegisterMicroservice();
   }
 }
 
 void QmitkNavigationDataPlayerView::OnUpdate(){
   if (m_VisFilter.IsNotNull())
   {
     m_VisFilter->Update();
     mitk::RenderingManager::GetInstance()->RequestUpdateAll();
   }
 }
 
 void QmitkNavigationDataPlayerView::OnSetDisplay(){
   DestroyPipeline();
   if ( (m_Controls->m_ChkDisplay->isChecked()) && ( m_Player.IsNotNull() ))
   {
     CreatePipeline();
   }
 }
 
 void QmitkNavigationDataPlayerView::CreatePipeline(){
   m_VisFilter = mitk::NavigationDataObjectVisualizationFilter::New();
   m_VisFilter->ConnectTo(m_Player);
 
   for (unsigned int i = 0 ; i < m_Player->GetNumberOfIndexedOutputs(); i++ ) {
     mitk::DataNode::Pointer node = mitk::DataNode::New();
     QString name = "Recorded Tool " + QString::number(i + 1);
     node->SetName(name.toStdString());
 
     //create small sphere and use it as surface
     mitk::Surface::Pointer mySphere = mitk::Surface::New();
     vtkSmartPointer<vtkSphereSource> vtkData = vtkSmartPointer<vtkSphereSource>::New();
     vtkData->SetRadius(5.0f);
     vtkData->SetCenter(0.0, 0.0, 0.0);
     vtkData->Update();
     mySphere->SetVtkPolyData(vtkData->GetOutput());
     node->SetData(mySphere);
-    m_VisFilter->SetRepresentationObject(i, mySphere);
+    m_VisFilter->SetRepresentationObject(i, mySphere.GetPointer());
 
     // Add Node to DataStorageand to local list of Nodes
     GetDataStorage()->Add(node);
     m_RenderingNodes.push_back(node);
   }
   m_VisFilter->Update();
 
   mitk::RenderingManager::GetInstance()->InitializeViewsByBoundingObjects(GetDataStorage());
   mitk::RenderingManager::GetInstance()->RequestUpdateAll();
 }
 
 void QmitkNavigationDataPlayerView::DestroyPipeline(){
   m_VisFilter = nullptr;
   for (unsigned int i = 0; i < m_RenderingNodes.size(); i++){
     this->GetDataStorage()->Remove(m_RenderingNodes[i]);
   }
   m_RenderingNodes.clear();
 }
 
 void QmitkNavigationDataPlayerView::SetInteractionComponentsEnabledState(bool isActive){
   m_Controls->m_grpbxSettings->setEnabled(isActive);
   m_Controls->m_grpbxControls->setEnabled(isActive);
 }