diff --git a/Core/Code/DataManagement/mitkOldTypeConversions.h b/Core/Code/DataManagement/mitkOldTypeConversions.h
index bdfe72b685..cd29efcc00 100644
--- a/Core/Code/DataManagement/mitkOldTypeConversions.h
+++ b/Core/Code/DataManagement/mitkOldTypeConversions.h
@@ -1,242 +1,242 @@
 /*===================================================================
 
 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 MITKOLDTYPECONVERSIONS_H_
 #define MITKOLDTYPECONVERSIONS_H_
 
 #include <vnl/vnl_quaternion.h>
 
 #include "mitkTypeBasics.h"
 #include "mitkTypedefs.h"
 #include "mitkVector.h"
 
 
 template <class T> class VectorTraits {
 public:
   typedef T ValueType;
 };
 
 template <> class VectorTraits<mitk::VnlVector> {
 public:
   typedef mitk::ScalarType ValueType;
 };
 
 template<> class VectorTraits<float[4]> {
 public:
   typedef float ValueType;
 };
 
 template<> class VectorTraits< itk::Index<5> > {
 public:
   typedef itk::Index<5>::IndexValueType ValueType;
 };
 
 template<> class VectorTraits< itk::Index<3> > {
 public:
   typedef itk::Index<3>::IndexValueType ValueType;
 };
 
 template<> class VectorTraits< long int [3]> {
 public:
   typedef long int ValueType;
 };
 template<> class VectorTraits< float [3]> {
 public:
   typedef float ValueType;
 };
 template<> class VectorTraits< double [3]> {
 public:
   typedef double ValueType;
 };
 
 template<> class VectorTraits< vnl_vector_fixed<mitk::ScalarType, 3> > {
 public:
   typedef mitk::ScalarType ValueType;
 };
 
 template<> class VectorTraits< long unsigned int[3]> {
 public:
   typedef long unsigned int ValueType;
 };
 
 template<> class VectorTraits< unsigned int *> {
 public:
   typedef unsigned int ValueType;
 };
 
 template<> class VectorTraits< double[4] > {
 public:
   typedef double ValueType;
 };
 
 template<> class VectorTraits< itk::Vector<float,3> > {
 public:
   typedef float ValueType;
 };
 
 template<> class VectorTraits< itk::Vector<double,3> > {
 public:
   typedef double ValueType;
 };
 
 template<> class VectorTraits< itk::Vector<int,3> > {
 public:
   typedef int ValueType;
 };
-/*
+
 template<> class VectorTraits< mitk::Vector<double,3> > {
 public:
   typedef double ValueType;
-};*/
+};
 
 template<> class VectorTraits< mitk::Point<float,3> > {
 public:
   typedef float ValueType;
 };
 
 template<> class VectorTraits< mitk::Point<float,4> > {
 public:
   typedef float ValueType;
 };
 
 template<> class VectorTraits< itk::Point<float,3> > {
 public:
   typedef float ValueType;
 };
 
 template<> class VectorTraits< itk::Point<float,4> > {
 public:
   typedef float ValueType;
 };
 
 template<> class VectorTraits< mitk::Point<double,3> > {
 public:
   typedef double ValueType;
 };
 
 template<> class VectorTraits< mitk::Point<double,4> > {
 public:
   typedef double ValueType;
 };
 
 template<> class VectorTraits< itk::Point<double,3> > {
 public:
   typedef double ValueType;
 };
 
 template<> class VectorTraits< itk::Point<double,4> > {
 public:
   typedef double ValueType;
 };
 
 template<> class VectorTraits< mitk::Point<int,3> > {
 public:
   typedef int ValueType;
 };
 
 namespace mitk
 {
 
   template <class Tout>
   inline void FillVector3D(Tout& out, mitk::ScalarType x, mitk::ScalarType y, mitk::ScalarType z)
   {
     out[0] = (typename VectorTraits<Tout>::ValueType)x;
     out[1] = (typename VectorTraits<Tout>::ValueType)y;
     out[2] = (typename VectorTraits<Tout>::ValueType)z;
   }
   template <class Tout>
   inline void FillVector4D(Tout& out, mitk::ScalarType x, mitk::ScalarType y, mitk::ScalarType z, mitk::ScalarType t)
   {
     out[0] = (typename VectorTraits<Tout>::ValueType)x;
     out[1] = (typename VectorTraits<Tout>::ValueType)y;
     out[2] = (typename VectorTraits<Tout>::ValueType)z;
     out[3] = (typename VectorTraits<Tout>::ValueType)t;
   }
 
   template <class Tin, class Tout>
   inline void itk2vtk(const Tin& in, Tout& out)
   {
     out[0]=(typename VectorTraits<Tout>::ValueType)(in[0]);
     out[1]=(typename VectorTraits<Tout>::ValueType)(in[1]);
     out[2]=(typename VectorTraits<Tout>::ValueType)(in[2]);
   }
 
   template <class Tin, class Tout>
   inline void vtk2itk(const Tin& in, Tout& out)
   {
     out[0]=(typename VectorTraits<Tout>::ValueType)(in[0]);
     out[1]=(typename VectorTraits<Tout>::ValueType)(in[1]);
     out[2]=(typename VectorTraits<Tout>::ValueType)(in[2]);
   }
 
   template <class Tin, class Tout>
   inline void vnl2vtk(const vnl_vector<Tin>& in, Tout *out)
   {
     unsigned int i;
     for(i=0; i<in.size();++i)
       out[i]=(Tout) (in[i]);
   }
 
   template <class Tin, class Tout>
   inline void vtk2vnl(const Tin *in, vnl_vector<Tout>& out)
   {
     unsigned int i;
     for(i=0; i<out.size();++i)
       out[i]=(Tout) (in[i]);
   }
 
   template <class Tin, class Tout>
   inline void vtk2vnlref(const Tin *in, vnl_vector_ref<Tout>& out)
   {
     unsigned int i;
     for(i=0; i<out.size();++i)
       out[i]=(Tout) (in[i]);
   }
 
   template <class Tin, class Tout, unsigned int n>
   inline void vnl2vtk(const vnl_vector_fixed<Tin, n>& in, Tout *out)
   {
     unsigned int i;
     for(i=0; i<in.size();++i)
       out[i]=(Tout) (in[i]);
   }
 
   template <class Tin, class Tout, unsigned int n>
   inline void vtk2vnl(const Tin *in, vnl_vector_fixed<Tout, n>& out)
   {
     unsigned int i;
     for(i=0; i<out.size();++i)
       out[i]=(Tout) (in[i]);
   }
 
 
   template <typename U, typename V, unsigned int NRows, unsigned int NColumns>
   inline void TransferMatrix(const itk::Matrix<U, NRows, NColumns>& in, itk::Matrix<V, NRows, NColumns>& out)
   {
     for (unsigned int i = 0; i < in.RowDimensions; ++i)
       for (unsigned int j = 0; j < in.ColumnDimensions; ++j)
         out[i][j] = in[i][j];
   }
 
 
 } // namespace mitk
 
 
 
 
 
 #endif /* MITKOLDTYPECONVERSIONS_H_ */
diff --git a/Core/Code/DataManagement/mitkPoint.h b/Core/Code/DataManagement/mitkPoint.h
index 59a9c15521..841bdeeeec 100644
--- a/Core/Code/DataManagement/mitkPoint.h
+++ b/Core/Code/DataManagement/mitkPoint.h
@@ -1,77 +1,76 @@
 /*===================================================================
 
 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 MITKPOINT_H
 #define MITKPOINT_H
 
 
 #include <itkPoint.h>
 #include "mitkTypeBasics.h"
 
-namespace mitk {
 
+namespace mitk {
 
-//##Documentation
-//##@brief enumeration of the type a point can be
-enum PointSpecificationType
-{
-  PTUNDEFINED = 0,
-  PTSTART,
-  PTCORNER,
-  PTEDGE,
-  PTEND
-};
-
-
-template<class TCoordRep, unsigned int NPointDimension = 3>
-class Point : public itk::Point<TCoordRep, NPointDimension>
-{
-
-public:
-     /** Default constructor has nothing to do. */
-  Point<TCoordRep, NPointDimension>() {}
-
-  /** Pass-through constructors for the Array base class. */
-  Point<TCoordRep, NPointDimension>(const mitk::Point<TCoordRep, NPointDimension>& r) : itk::Point<TCoordRep, NPointDimension>(r) {}
-  Point<TCoordRep, NPointDimension>(const TCoordRep r[NPointDimension]):itk::Point<TCoordRep, NPointDimension>(r) {}
-  Point<TCoordRep, NPointDimension>(const TCoordRep & v):itk::Point<TCoordRep, NPointDimension>(v) {}
-  Point<TCoordRep, NPointDimension>(const itk::Point<TCoordRep, NPointDimension> r) : itk::Point<TCoordRep, NPointDimension>(r) {}
-
-  /**
-  * Warning: Array must have same dimension as Point
-  */
-  void CopyToArray(ScalarType* const array_p) const
+  //##Documentation
+  //##@brief enumeration of the type a point can be
+  enum PointSpecificationType
+  {
+    PTUNDEFINED = 0,
+    PTSTART,
+    PTCORNER,
+    PTEDGE,
+    PTEND
+  };
+
+  template<class TCoordRep, unsigned int NPointDimension = 3>
+  class Point : public itk::Point<TCoordRep, NPointDimension>
   {
-    for (int i = 0; i < this->GetPointDimension(); i++)
+
+  public:
+    /** Default constructor has nothing to do. */
+    Point<TCoordRep, NPointDimension>() {}
+
+    /** Pass-through constructors for the Array base class. */
+    Point<TCoordRep, NPointDimension>(const mitk::Point<TCoordRep, NPointDimension>& r) : itk::Point<TCoordRep, NPointDimension>(r) {}
+    Point<TCoordRep, NPointDimension>(const TCoordRep r[NPointDimension]):itk::Point<TCoordRep, NPointDimension>(r) {}
+    Point<TCoordRep, NPointDimension>(const TCoordRep & v):itk::Point<TCoordRep, NPointDimension>(v) {}
+    Point<TCoordRep, NPointDimension>(const itk::Point<TCoordRep, NPointDimension> r) : itk::Point<TCoordRep, NPointDimension>(r) {}
+
+    /**
+     * Warning: Array must have same dimension as Point
+     */
+    void CopyToArray(ScalarType* const array_p) const
     {
-      array_p[i] = this->GetElement(i);
+      for (int i = 0; i < this->GetPointDimension(); i++)
+        {
+          array_p[i] = this->GetElement(i);
+        }
     }
-  }
-};
+  };
 
-typedef Point<ScalarType,2> Point2D;
-typedef Point<ScalarType,3> Point3D;
-typedef Point<ScalarType,4> Point4D;
+  typedef Point<ScalarType,2> Point2D;
+  typedef Point<ScalarType,3> Point3D;
+  typedef Point<ScalarType,4> Point4D;
 
-typedef Point<int,2> Point2I;
-typedef Point<int,3> Point3I;
-typedef Point<int,4> Point4I;
+  typedef Point<int,2> Point2I;
+  typedef Point<int,3> Point3I;
+  typedef Point<int,4> Point4I;
 
 } // namespace mitk
 
 
 #endif /* MITKPOINT_H */
diff --git a/Core/Code/DataManagement/mitkTypedefs.h b/Core/Code/DataManagement/mitkTypedefs.h
index 3054cd58ce..a4832024ff 100644
--- a/Core/Code/DataManagement/mitkTypedefs.h
+++ b/Core/Code/DataManagement/mitkTypedefs.h
@@ -1,52 +1,52 @@
 /*===================================================================
 
 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 MITKTYPEDEFS_H_
 #define MITKTYPEDEFS_H_
 
 
 #include <itkIndex.h>
 #include <itkContinuousIndex.h>
 #include <itkVector.h>
 #include <itkMatrix.h>
 #include <itkTransform.h>
 #include <vnl/vnl_quaternion.h>
+#include <utility>
 
 #include "mitkTypeBasics.h"
 
 //template<class TCoordRep, unsigned int NPointDimension>  class Vector;
 
 namespace mitk {
 
 typedef itk::Matrix<ScalarType, 3, 3> Matrix3D;
 typedef itk::Matrix<ScalarType,4,4> Matrix4D;
 typedef vnl_matrix_fixed<ScalarType, 3, 3> VnlMatrix3D;
 typedef itk::Transform<ScalarType, 3, 3> Transform3D;
 typedef vnl_vector<ScalarType> VnlVector;
 typedef vnl_vector_ref<ScalarType> VnlVectorRef;
 
 typedef itk::Index<3> Index3D;
 typedef itk::ContinuousIndex<ScalarType, 3> ContinuousIndex3D;
 typedef vnl_quaternion<ScalarType> Quaternion;
 
 typedef itk::NumericTraits<mitk::ScalarType> ScalarTypeNumericTraits;
 
-typedef itk::Vector<ScalarType,2> Vector2D;
-typedef itk::Vector<ScalarType,3> Vector3D;
+typedef std::pair<std::string, bool> FileServiceOption;
 
 }
 
 #endif /* MITKTYPEDEFS_H_ */
diff --git a/Core/Code/DataManagement/mitkVector.h b/Core/Code/DataManagement/mitkVector.h
index 11edb5f7f7..77c837e77d 100644
--- a/Core/Code/DataManagement/mitkVector.h
+++ b/Core/Code/DataManagement/mitkVector.h
@@ -1,23 +1,58 @@
 /*===================================================================
 
 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 MITKVECTOR_H_
 #define MITKVECTOR_H_
 
 
-
+#include <itkVector.h>
+
+#include "mitkTypeBasics.h"
+
+namespace mitk
+{
+
+  template<class TCoordRep, unsigned int NPointDimension = 3>
+  class Vector : public itk::Vector<TCoordRep, NPointDimension>
+  {
+  public:
+    /** Default constructor has nothing to do. */
+    Vector<TCoordRep, NPointDimension>() {}
+
+    /** Pass-through constructors for the Array base class. */
+    Vector<TCoordRep, NPointDimension>(const Vector<TCoordRep, NPointDimension>& r) : itk::Vector<TCoordRep, NPointDimension>(r) {}
+    Vector<TCoordRep, NPointDimension>(const TCoordRep r[NPointDimension]):itk::Vector<TCoordRep, NPointDimension>(r) {}
+    Vector<TCoordRep, NPointDimension>(const TCoordRep & v):itk::Vector<TCoordRep, NPointDimension>(v) {}
+    Vector<TCoordRep, NPointDimension>(const itk::Vector<TCoordRep, NPointDimension> r) : itk::Vector<TCoordRep, NPointDimension>(r) {}
+    /**
+     * Warning: Array must have same dimension as Point
+     */
+    void CopyToArray(ScalarType* const array_p) const
+    {
+      for (int i = 0; i < this->GetPointDimension(); i++)
+        {
+          array_p[i] = this->GetElement(i);
+        }
+    }
+  };
+
+  typedef Vector<ScalarType,2> Vector2D;
+  typedef Vector<ScalarType,3> Vector3D;
+  typedef Vector<ScalarType,4> Vector4D;
+
+}
 
 #endif /* MITKVECTOR_H_ */