diff --git a/Modules/Core/src/DataManagement/mitkTimeGeometry.cpp b/Modules/Core/src/DataManagement/mitkTimeGeometry.cpp
index fc9829401e..05cb1698db 100644
--- a/Modules/Core/src/DataManagement/mitkTimeGeometry.cpp
+++ b/Modules/Core/src/DataManagement/mitkTimeGeometry.cpp
@@ -1,300 +1,300 @@
 /*===================================================================
 
 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 <mitkTimeGeometry.h>
 
 #include <mitkExceptionMacro.h>
 #include <mitkGeometry3D.h>
 
 mitk::TimeGeometry::TimeGeometry() : m_BoundingBox(BoundingBox::New())
 {
   typedef BoundingBox::PointsContainer ContainerType;
   ContainerType::Pointer points = ContainerType::New();
   m_BoundingBox->SetPoints(points.GetPointer());
 }
 
 mitk::TimeGeometry::~TimeGeometry() = default;
 
 void mitk::TimeGeometry::Initialize()
 {
 }
 
 /* \brief short description
  * parameters
  *
  */
 mitk::Point3D mitk::TimeGeometry::GetCornerPointInWorld(int id) const
 {
   assert(id >= 0);
   assert(m_BoundingBox.IsNotNull());
 
-  BoundingBox::BoundsArrayType bounds = m_BoundingBox->GetBounds();
+  auto& bounds = m_BoundingBox->GetBounds();
 
   Point3D cornerpoint;
   switch (id)
   {
     case 0:
       FillVector3D(cornerpoint, bounds[0], bounds[2], bounds[4]);
       break;
     case 1:
       FillVector3D(cornerpoint, bounds[0], bounds[2], bounds[5]);
       break;
     case 2:
       FillVector3D(cornerpoint, bounds[0], bounds[3], bounds[4]);
       break;
     case 3:
       FillVector3D(cornerpoint, bounds[0], bounds[3], bounds[5]);
       break;
     case 4:
       FillVector3D(cornerpoint, bounds[1], bounds[2], bounds[4]);
       break;
     case 5:
       FillVector3D(cornerpoint, bounds[1], bounds[2], bounds[5]);
       break;
     case 6:
       FillVector3D(cornerpoint, bounds[1], bounds[3], bounds[4]);
       break;
     case 7:
       FillVector3D(cornerpoint, bounds[1], bounds[3], bounds[5]);
       break;
     default:
     {
       itkExceptionMacro(<< "A cube only has 8 corners. These are labeled 0-7.");
       return Point3D();
     }
   }
 
   // TimeGeometry has no Transformation. Therefore the bounding box
   // contains all data in world coordinates
   return cornerpoint;
 }
 
 mitk::Point3D mitk::TimeGeometry::GetCornerPointInWorld(bool xFront, bool yFront, bool zFront) const
 {
   assert(m_BoundingBox.IsNotNull());
-  BoundingBox::BoundsArrayType bounds = m_BoundingBox->GetBounds();
+  auto& bounds = m_BoundingBox->GetBounds();
 
   Point3D cornerpoint;
   cornerpoint[0] = (xFront ? bounds[0] : bounds[1]);
   cornerpoint[1] = (yFront ? bounds[2] : bounds[3]);
   cornerpoint[2] = (zFront ? bounds[4] : bounds[5]);
 
   return cornerpoint;
 }
 
 mitk::Point3D mitk::TimeGeometry::GetCenterInWorld() const
 {
   assert(m_BoundingBox.IsNotNull());
   return m_BoundingBox->GetCenter();
 }
 
 double mitk::TimeGeometry::GetDiagonalLength2InWorld() const
 {
   const Vector3D diagonalvector = GetCornerPointInWorld()-GetCornerPointInWorld(false, false, false);
   return diagonalvector.GetSquaredNorm();
 }
 
 double mitk::TimeGeometry::GetDiagonalLengthInWorld() const
 {
   return sqrt(GetDiagonalLength2InWorld());
 }
 
 bool mitk::TimeGeometry::IsWorldPointInside(const mitk::Point3D &p) const
 {
   return m_BoundingBox->IsInside(p);
 }
 
 void mitk::TimeGeometry::UpdateBoundingBox()
 {
   assert(m_BoundingBox.IsNotNull());
   typedef BoundingBox::PointsContainer ContainerType;
 
   unsigned long lastModifiedTime = 0;
   unsigned long currentModifiedTime = 0;
 
   ContainerType::Pointer points = ContainerType::New();
   const TimeStepType numberOfTimesteps = CountTimeSteps();
 
   points->reserve(2*numberOfTimesteps);
   for (TimeStepType step = 0; step <numberOfTimesteps; ++step)
   {
     currentModifiedTime = GetGeometryForTimeStep(step)->GetMTime();
     if (currentModifiedTime > lastModifiedTime)
       lastModifiedTime = currentModifiedTime;
 
     for (int i = 0; i < 8; ++i)
     {
       Point3D cornerPoint = GetGeometryForTimeStep(step)->GetCornerPoint(i);
       points->push_back(cornerPoint);
     }
   }
   m_BoundingBox->SetPoints(points);
   m_BoundingBox->ComputeBoundingBox();
   if (this->GetMTime() < lastModifiedTime)
     this->Modified();
 }
 
 mitk::ScalarType mitk::TimeGeometry::GetExtentInWorld(unsigned int direction) const
 {
   assert(direction < 3);
   assert(m_BoundingBox.IsNotNull());
-  BoundingBox::BoundsArrayType bounds = m_BoundingBox->GetBounds();
+  auto& bounds = m_BoundingBox->GetBounds();
   return bounds[direction * 2 + 1] - bounds[direction * 2];
 }
 
 void mitk::TimeGeometry::Update()
 {
   this->UpdateBoundingBox();
   this->UpdateWithoutBoundingBox();
 }
 
 void mitk::TimeGeometry::ExecuteOperation(mitk::Operation *op)
 {
   for (TimeStepType step = 0; step < CountTimeSteps(); ++step)
   {
     GetGeometryForTimeStep(step)->ExecuteOperation(op);
   }
 }
 
 void mitk::TimeGeometry::PrintSelf(std::ostream &os, itk::Indent indent) const
 {
   // Superclass::PrintSelf(os,indent);
   os << indent << " TimeSteps: " << this->CountTimeSteps() << std::endl;
 
   os << std::endl;
   os << indent << " GetGeometryForTimeStep(0): ";
   if (GetGeometryForTimeStep(0).IsNull())
     os << "nullptr" << std::endl;
   else
     GetGeometryForTimeStep(0)->Print(os, indent);
 }
 
 itk::LightObject::Pointer mitk::TimeGeometry::InternalClone() const
 {
   itk::LightObject::Pointer parent = Superclass::InternalClone();
   Self::Pointer rval = dynamic_cast<Self *>(parent.GetPointer());
   if (rval.IsNull())
   {
     mitkThrow() << " Downcast to type " << this->GetNameOfClass() << " failed.";
   }
   rval->m_BoundingBox = m_BoundingBox->DeepCopy();
   return parent;
 }
 
 bool mitk::Equal(const TimeGeometry &leftHandSide, const TimeGeometry &rightHandSide, ScalarType eps, bool verbose)
 {
   bool result = true;
 
   // Compare BoundingBoxInWorld
   if (!mitk::Equal(*(leftHandSide.GetBoundingBoxInWorld()), *(rightHandSide.GetBoundingBoxInWorld()), eps, verbose))
   {
     if (verbose)
     {
       MITK_INFO << "[( TimeGeometry )] BoundingBoxInWorld differs.";
       MITK_INFO << "rightHandSide is " << setprecision(12) << rightHandSide.GetBoundingBoxInWorld()
                 << " : leftHandSide is " << leftHandSide.GetBoundsInWorld() << " and tolerance is " << eps;
     }
     result = false;
   }
 
   if (!mitk::Equal(leftHandSide.CountTimeSteps(), rightHandSide.CountTimeSteps(), eps, verbose))
   {
     if (verbose)
     {
       MITK_INFO << "[( TimeGeometry )] CountTimeSteps differs.";
       MITK_INFO << "rightHandSide is " << setprecision(12) << rightHandSide.CountTimeSteps() << " : leftHandSide is "
                 << leftHandSide.CountTimeSteps() << " and tolerance is " << eps;
     }
     result = false;
   }
 
   if (!mitk::Equal(leftHandSide.GetMinimumTimePoint(), rightHandSide.GetMinimumTimePoint(), eps, verbose))
   {
     if (verbose)
     {
       MITK_INFO << "[( TimeGeometry )] MinimumTimePoint differs.";
       MITK_INFO << "rightHandSide is " << setprecision(12) << rightHandSide.GetMinimumTimePoint()
                 << " : leftHandSide is " << leftHandSide.GetMinimumTimePoint() << " and tolerance is " << eps;
     }
     result = false;
   }
 
   if (!mitk::Equal(leftHandSide.GetMaximumTimePoint(), rightHandSide.GetMaximumTimePoint(), eps, verbose))
   {
     if (verbose)
     {
       MITK_INFO << "[( TimeGeometry )] MaximumTimePoint differs.";
       MITK_INFO << "rightHandSide is " << setprecision(12) << rightHandSide.GetMaximumTimePoint()
                 << " : leftHandSide is " << leftHandSide.GetMaximumTimePoint() << " and tolerance is " << eps;
     }
     result = false;
   }
 
   if (!result)
     return false; // further tests require that both parts have identical number of time steps
 
   for (mitk::TimeStepType t = 0; t < leftHandSide.CountTimeSteps(); ++t)
   {
     if (!mitk::Equal(leftHandSide.TimeStepToTimePoint(t), rightHandSide.TimeStepToTimePoint(t), eps, verbose))
     {
       if (verbose)
       {
         MITK_INFO << "[( TimeGeometry )] TimeStepToTimePoint(" << t << ") differs.";
         MITK_INFO << "rightHandSide is " << setprecision(12) << rightHandSide.TimeStepToTimePoint(t)
                   << " : leftHandSide is " << leftHandSide.TimeStepToTimePoint(t) << " and tolerance is " << eps;
       }
       result = false;
     }
 
     BaseGeometry::Pointer leftGeometry = leftHandSide.GetGeometryForTimeStep(t);
     BaseGeometry::Pointer rightGeometry = rightHandSide.GetGeometryForTimeStep(t);
 
     if (leftGeometry.IsNotNull() && rightGeometry.IsNull())
       continue; // identical
     if (leftGeometry.IsNull())
     {
       if (verbose)
       {
         MITK_INFO << "[( TimeGeometry )] TimeStepToTimePoint(" << t << ") differs.";
         MITK_INFO << "rightHandSide is an object : leftHandSide is nullptr";
       }
       result = false;
       continue; // next geometry
     }
 
     if (rightGeometry.IsNull())
     {
       if (verbose)
       {
         MITK_INFO << "[( TimeGeometry )] TimeStepToTimePoint(" << t << ") differs.";
         MITK_INFO << "rightHandSide is nullptr : leftHandSide is an object";
       }
       result = false;
       continue; // next geometry
     }
 
     if (!mitk::Equal(*leftGeometry, *rightGeometry, eps, verbose))
     {
       if (verbose)
       {
         MITK_INFO << "[( TimeGeometry )] GetGeometryForTimeStep(" << t << ") differs.";
       }
       result = false;
     }
 
   } // end for each t
 
   return result;
 }