diff --git a/Wrapping/Common/mitk_swig_classes.i b/Wrapping/Common/mitk_swig_classes.i
index ab7c6cbbd5..edc2842ba1 100644
--- a/Wrapping/Common/mitk_swig_classes.i
+++ b/Wrapping/Common/mitk_swig_classes.i
@@ -1,208 +1,212 @@
 //
 // Defining some Macros that make problems with SWIG as the
 // corresponding definitions are not included by default.
 // Luckely, these includes are not necessary for SWIG.
 //
 #define ITK_NOEXCEPT
 #define ITKCommon_EXPORT
 #define ITK_OVERRIDE
 #define MITKCORE_EXPORT
 #define MITKCLCORE_EXPORT
 #define MITKCLUTILITIES_EXPORT
 #define ITKCommon_EXPORT
 #define MITKMATCHPOINTREGISTRATION_EXPORT
 #define MAPDeployment_EXPORT
 #define MAPAlgorithms_EXPORT
 #define MITKSEGMENTATION_EXPORT
 #define MITKMULTILABEL_EXPORT
 #define MITKBASICIMAGEPROCESSING_EXPORT
 
 #define VCL_TEMPLATE_EXPORT
 
 #define ITKCommon_EXPORT
 #define ITK_FORWARD_EXPORT
 #define ITK_OVERRIDE
 #define ITK_NOEXCEPT
 
-
 %include <itkMacro.h>
 %include <mitkCommon.h>
 %include <itkSmartPointer.h>
 %include <mitkPixelType.h>
 %include <mitkChannelDescriptor.h>
 %include <mitkIOUtil.h>
+%include <mitkBaseGeometry.h>
 
 #define DEPRECATED(func) func
 #undef ITK_DISALLOW_COPY_AND_ASSIGN
 #define ITK_DISALLOW_COPY_AND_ASSIGN(TypeName)
 
 typedef double ScalarType;
 typedef Vector3D mitk::Vector3D;
 
 %pythoncode %{
  convertion_list = {}
 %}
 
+
 SWIG_ADD_NONOBJECT_CLASS(Indent, itkIndent.h, itk)
 SWIG_ADD_MITK_CLASS(LightObject, itkLightObject.h, itk)
 SWIG_ADD_MITK_CLASS(Object, itkObject.h, itk)
 SWIG_ADD_MITK_CLASS(DataObject, itkDataObject.h, itk)
 
 SWIG_ADD_MITK_CLASS(TimeGeometry, mitkTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(ArbitraryTimeGeometry, mitkArbitraryTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(ProportionalTimeGeometry, mitkProportionalTimeGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(BaseGeometry, mitkBaseGeometry.h, mitk)
 SWIG_ADD_MITK_CLASS(Geometry3D, mitkGeometry3D.h, mitk)
 SWIG_ADD_MITK_CLASS(SlicedGeometry3D, mitkSlicedGeometry3D.h, mitk)
 SWIG_ADD_MITK_CLASS(PlaneGeometry , mitkPlaneGeometry.h, mitk)
 
 %rename(itk_BoundingBox) itk::BoundingBox;
 %include <mitkBaseGeometry.h>
 %{
 #include < mitkBaseGeometry.h >
 typedef mitk::BoundingBox BoundingBox;
 %}
 %template(VectorBoundingBoxPointer) std::vector< mitk::BoundingBox * >;
 
 
 //SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(BoundingBox, mitkBaseGeometry.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(TimeBounds, mitkBaseGeometry.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(FixedArrayType, mitkBaseGeometry.h, mitk)
 
 SWIG_ADD_NONOBJECT_CLASS(Point2D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point3D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point4D, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point2I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point3I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(Point4I, mitkPoint.h, mitk)
 SWIG_ADD_NONOBJECT_CLASS(VnlVector, mitkVector.h, mitk)
 %ignore rBegin() const;
 %ignore rEnd() const;
 %ignore rBegin();
 %ignore rEnd();
 %ignore itk::Vector::GetVnlVector;
 %ignore itk::Vector::Get_vnl_vector;
 %ignore itk::Vector::Get_vnl_vector const;
 
 %{
   #include <itkFixedArray.h>
   #include <itkVector.h>
   #include <vnl/vnl_vector_ref.h>
   typedef vnl_vector_ref<ScalarType> VnlVectorRef;
 %}
 //%include <vnl/vnl_vector_ref.h>
 //MITKSWIG_ADD_CLASS(VnlVectorRef, mitkVector.h,)
 //typedef ::VnlVectorRef VnlVectorRef;
 class VnlVectorRef;
 %template(VectorVnlVectorRefPointer) std::vector<::VnlVectorRef * >;
 //SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(VnlVectorRef, mitkVector.h, )
 
 %include <itkFixedArray.h>
 %include <itkVector.h>
 class itk::FixedArray<ScalarType, 3>::ReverseIterator;
 //%template(VnlVectorRef) vnl_vector_ref<ScalarType>;
-%template(itkFixedArray3D) itk::FixedArray<ScalarType, 3>;
-%template(itkVector2D) itk::Vector<ScalarType, 2>;
-%template(itkVector3D) itk::Vector<ScalarType, 3>;
-%template(itkVector4D) itk::Vector<ScalarType, 4>;
-
+%template(itkFixedArray2D) itk::FixedArray<double, 2>;
+%template(itkFixedArray3D) itk::FixedArray<double, 3>;
+%template(itkFixedArray3UD) itk::FixedArray<double, 3U>;
+%template(itkFixedArray4D) itk::FixedArray<double, 4>;
+%template(itkVector2D) itk::Vector<double, 2>;
+%template(itkVector3D) itk::Vector<double, 3>;
+%template(itkVector3UD) itk::Vector<double, 3U>;
+%template(itkVector4D) itk::Vector<double, 4>;
 
 SWIG_ADD_NONOBJECT_TEMPLATE_CLASS(Vector2D, mitkVector.h, mitk)
-%template(Vector2D) mitk::Vector<ScalarType, 2>;
+%template(Vector2D) mitk::Vector<double, 2>;
 SWIG_ADD_NONOBJECT_TEMPLATE_CLASS(Vector3D, mitkVector.h, mitk)
-%template(Vector3D) mitk::Vector<ScalarType, 3>;
+%template(Vector3D) mitk::Vector<double, 3>;
 SWIG_ADD_NONOBJECT_TEMPLATE_CLASS(Vector4D, mitkVector.h, mitk)
 %template(Vector4D) mitk::Vector<ScalarType, 4>;
 
 SWIG_ADD_MITK_CLASS(BaseData, mitkBaseData.h, mitk)
 SWIG_ADD_MITK_CLASS(SlicedData, mitkSlicedData.h, mitk)
 SWIG_ADD_MITK_CLASS(Image, mitkImage.h, mitk)
 SWIG_ADD_MITK_CLASS(LabelSetImage, mitkLabelSetImage.h, mitk)
 SWIG_ADD_MITK_CLASS(PointSet, mitkPointSet.h, mitk)
 %{
 using mitk::Message;
 %}
 
 //
 // Phenotyping Related Classes
 //
 SWIG_ADD_MITK_CLASS(AbstractGlobalImageFeature, mitkAbstractGlobalImageFeature.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFImageDescriptionFeatures, mitkGIFImageDescriptionFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFFirstOrderStatistics, mitkGIFFirstOrderStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFFirstOrderHistogramStatistics, mitkGIFFirstOrderHistogramStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFFirstOrderNumericStatistics, mitkGIFFirstOrderNumericStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFVolumetricStatistics, mitkGIFVolumetricStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFVolumetricDensityStatistics, mitkGIFVolumetricDensityStatistics.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFCooccurenceMatrix2, mitkGIFCooccurenceMatrix2.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFNeighbouringGreyLevelDependenceFeature, mitkGIFNeighbouringGreyLevelDependenceFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelRunLength, mitkGIFGreyLevelRunLength.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelSizeZone, mitkGIFGreyLevelSizeZone.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFGreyLevelDistanceZone, mitkGIFGreyLevelDistanceZone.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFLocalIntensity, mitkGIFLocalIntensity.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFIntensityVolumeHistogramFeatures, mitkGIFIntensityVolumeHistogramFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFNeighbourhoodGreyToneDifferenceFeatures, mitkGIFNeighbourhoodGreyToneDifferenceFeatures.h, mitk)
 SWIG_ADD_MITK_CLASS(GIFCurvatureStatistic, mitkGIFCurvatureStatistic.h, mitk)
 
 //
 // Conversion and Segmentation based Classes
 //
 SWIG_ADD_MITK_CLASS(ContourModelSetToImageFilter, mitkContourModelSetToImageFilter.h, mitk)
 SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(BooleanOperation, mitkBooleanOperation.h, mitk)
 SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(MorphologicalOperations, mitkMorphologicalOperations.h, mitk)
 //SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(MaskCleaningOperation, mitkMaskCleaningOperation.h, mitk)
 //SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(TransformationOperation, mitkTransformationOperation.h, mitk)
 //SWIG_ADD_NONOBJECT_NOVECTOR_CLASS(ArithmeticOperation, mitkArithmeticOperation.h, mitk)
 %{
   #include <itkProcessObject.h>
   typedef itk::DataObject::DataObjectIdentifierType DataObjectIdentifierType;
   typedef itk::ProcessObject::DataObjectPointerArraySizeType DataObjectPointerArraySizeType;
 %}
 
 //
 // MatchPoint Related Classes
 //
 %ignore DLLHandle::LibraryHandleType;
 
 %{
 #include <mapDeploymentDLLHandle.h>
 namespace core
 {
   typedef std::string String;
 }
 typedef map::deployment::DLLHandle::LibraryHandleType LibraryHandleType;
 typedef map::deployment::DLLHandle DLLHandle;
 %}
 namespace core
 {
   typedef std::string String;
 }
 
 %nodefaultctor LibraryHandleType;
 struct LibraryHandleType {};
 
 %include <mapUID.h>
 SWIG_ADD_MITK_CLASS(UID,mapUID.h, map::algorithm)
 SWIG_ADD_MITK_CLASS(DLLInfo, mapDeploymentDLLInfo.h, map::deployment)
 //SWIG_ADD_MITK_CLASS_VECTORFREE(DLLHandle, mapDeploymentDLLHandle.h, map::deployment)
 
 SWIG_ADD_MITK_CLASS_VECTORFREE(DLLDirectoryBrowser, mapDeploymentDLLDirectoryBrowser.h, ::map::deployment)
 MITKSWIG_ADD_HEADERFILE(mapDeploymentDLLAccess.h)
 %{
  DLLHandle const *  ConvertDLLHandleSmartPointerToPointer(itk::SmartPointer<map::deployment::DLLHandle> p)
  {
    return p.GetPointer();
  }
 %}
 DLLHandle const * ConvertDLLHandleSmartPointerToPointer(DLLHandle::Pointer p);
 
 MITKSWIG_ADD_CLASS(MAPAlgorithmHelper, mitkMAPAlgorithmHelper.h, mitk)
 MITKSWIG_ADD_CLASS(RegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
 MITKSWIG_ADD_CLASS(MITKRegistrationType, mitkImageMappingHelper.h, mitk::ImageMappingHelper)
 
 // SWIG_ADD_MITK_CLASS(FastSymmetricForcesDemonsMultiResDefaultRegistrationAlgorithm, mitkFastSymmetricForcesDemonsMultiResDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(LevelSetMotionMultiResDefaultRegistrationAlgorithm, mitkLevelSetMotionMultiResDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalAffineDefaultRegistrationAlgorithm, mitkMultiModalAffineDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalRigidDefaultRegistrationAlgorithm, mitkMultiModalRigidDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(MultiModalTransDefaultRegistrationAlgorithm, mitkMultiModalTransDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(RigidClosedFormPointsDefaultRegistrationAlgorithm, mitkRigidClosedFormPointsDefaultRegistrationAlgorithm.h, mitk)
 // SWIG_ADD_MITK_CLASS(RigidICPDefaultRegistrationAlgorithm, mitkRigidICPDefaultRegistrationAlgorithm.h, mitk)
\ No newline at end of file
diff --git a/Wrapping/Common/mitk_swig_cpp_include.i b/Wrapping/Common/mitk_swig_cpp_include.i
index 198e92ece6..ce8086d6a6 100644
--- a/Wrapping/Common/mitk_swig_cpp_include.i
+++ b/Wrapping/Common/mitk_swig_cpp_include.i
@@ -1,127 +1,127 @@
 %{
-
 #include <mitkBaseData.h>
 #include <mitkIOUtil.h>
 #include <mitkSlicedData.h>
 #include <mitkImage.h>
 #include <mitkPointSet.h>
 #include <mitkChannelDescriptor.h>
 #include <mitkPixelType.h>
 #include <mitkIntensityQuantifier.h>
+#include <mitkBaseGeometry.h>
 
 // SWIG Doesn't wrap namespaces. This leads to some problems, if the namespaces are not used.
 using mitk::DataStorage;
 using mitk::IFileReader;
 using mitk::IFileWriter;
 using mitk::ScalarType;
 using mitk::Operation;
 using mitk::GeometryTransformHolder;
 using mitk::AffineTransform3D;
 using mitk::BaseProperty;
 using mitk::ImageDescriptor;
 using mitk::PropertyList;
 using mitk::ImageDataItem;
 using mitk::PointSpecificationType;
 using mitk::IntensityQuantifier;
 
 using itk::LightObject;
 using itk::ModifiedTimeType;
 using itk::TimeStamp;
 using itk::EventObject;
 using itk::MetaDataDictionary;
 using itk::SmartPointerForwardReference;
 using itk::RealTimeStamp;
 
 
 std::vector<unsigned int> GetImageSize(mitk::Image::Pointer image)
 {
   std::vector< unsigned int > size;
   unsigned int dimension = image->GetDimension();
   for (int i = 0; i < dimension; ++i)
   {
     size.push_back(image->GetDimension(i));
   }
   return size;
 }
 
 std::vector<unsigned int> GetImageSize(mitk::Image* image)
 {
   std::vector< unsigned int > size;
   unsigned int dimension = image->GetDimension();
   for (int i = 0; i < dimension; ++i)
   {
     size.push_back(image->GetDimension(i));
   }
   return size;
 }
 
 struct TypeDefinitions
 {
    static const int ComponentTypeUInt8 = mitk::MapPixelType<uint8_t, mitk::isPrimitiveType<uint8_t>::value>::IOComponentType;
    static const int ComponentTypeInt8 = mitk::MapPixelType<int8_t, mitk::isPrimitiveType<int8_t>::value>::IOComponentType;
    static const int ComponentTypeUInt16 = mitk::MapPixelType<uint16_t, mitk::isPrimitiveType<uint16_t>::value>::IOComponentType;
    static const int ComponentTypeInt16 = mitk::MapPixelType<int16_t, mitk::isPrimitiveType<int16_t>::value>::IOComponentType;
    static const int ComponentTypeUInt32 = mitk::MapPixelType<uint32_t, mitk::isPrimitiveType<uint32_t>::value>::IOComponentType;
    static const int ComponentTypeInt32 = mitk::MapPixelType<int32_t, mitk::isPrimitiveType<int32_t>::value>::IOComponentType;
    static const int ComponentTypeFloat = mitk::MapPixelType<float, mitk::isPrimitiveType<float>::value>::IOComponentType;
    static const int ComponentTypeDouble = mitk::MapPixelType<double, mitk::isPrimitiveType<double>::value>::IOComponentType;
 };
 
 mitk::PixelType MakePixelTypeFromTypeID(int componentTypeID, int numberOfComponents)
 {
    switch (componentTypeID)
    {
       case TypeDefinitions::ComponentTypeUInt8 :
       return mitk::MakePixelType<uint8_t, uint8_t>(numberOfComponents);
       case TypeDefinitions::ComponentTypeInt8 :
       return mitk::MakePixelType<int8_t, int8_t>(numberOfComponents);
       case TypeDefinitions::ComponentTypeUInt16 :
       return mitk::MakePixelType<uint16_t, uint16_t>(numberOfComponents);
       case TypeDefinitions::ComponentTypeInt16 :
       return mitk::MakePixelType<int16_t, int16_t>(numberOfComponents);
       case TypeDefinitions::ComponentTypeUInt32 :
       return mitk::MakePixelType<uint32_t, uint32_t>(numberOfComponents);
       case TypeDefinitions::ComponentTypeInt32 :
       return mitk::MakePixelType<int32_t, int32_t>(numberOfComponents);
       case TypeDefinitions::ComponentTypeFloat :
       return mitk::MakePixelType<float, float>(numberOfComponents);
       case TypeDefinitions::ComponentTypeDouble :
       return mitk::MakePixelType<double, double>(numberOfComponents);
     default:
       return mitk::MakePixelType<double, double>(numberOfComponents);
    }
 }
 
 mitk::Image::Pointer MakeImage(mitk::PixelType pixelType, std::vector<unsigned int> shape)
 {
     mitk::Image::Pointer image = mitk::Image::New();
   image->Initialize(pixelType, shape.size(), shape.data());
   return image;
 }
 
 template<class T>
 typename T::Pointer ConvertTo(itk::Object::Pointer base)
 {
   typename T::Pointer erg = dynamic_cast<T*>(base.GetPointer());
   return erg;
 }
 
 %}
 
 std::vector<unsigned int> GetImageSize(mitk::Image::Pointer image);
 std::vector<unsigned int> GetImageSize(mitk::Image* image);
 mitk::PixelType MakePixelTypeFromTypeID(int componentTypeID, int numberOfComponents);
 mitk::Image::Pointer MakeImage(mitk::PixelType pixelType, std::vector<unsigned int> shape);
 
 %constant int ComponentTypeUInt8 = TypeDefinitions::ComponentTypeUInt8;
 %constant int ComponentTypeInt8 = TypeDefinitions::ComponentTypeInt8;
 %constant int ComponentTypeUInt16 = TypeDefinitions::ComponentTypeUInt16;
 %constant int ComponentTypeInt16 = TypeDefinitions::ComponentTypeInt16;
 %constant int ComponentTypeUInt32 = TypeDefinitions::ComponentTypeUInt32;
 %constant int ComponentTypeInt32 = TypeDefinitions::ComponentTypeInt32;
 %constant int ComponentTypeFloat = TypeDefinitions::ComponentTypeFloat;
 %constant int ComponentTypeDouble = TypeDefinitions::ComponentTypeDouble;
 
 template<class T>
 typename T::Pointer ConvertTo(itk::Object::Pointer base);