diff --git a/Modules/ContourModel/Algorithms/mitkContourObjectFactory.cpp b/Modules/ContourModel/Algorithms/mitkContourObjectFactory.cpp
index 946071026c..f270c718be 100644
--- a/Modules/ContourModel/Algorithms/mitkContourObjectFactory.cpp
+++ b/Modules/ContourModel/Algorithms/mitkContourObjectFactory.cpp
@@ -1,157 +1,158 @@
 /*===================================================================
 
 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 "mitkContourObjectFactory.h"
 
 #include "mitkProperties.h"
 #include "mitkBaseRenderer.h"
 #include "mitkDataNode.h"
 #include "mitkCoreObjectFactory.h"
 
 
 #include "mitkContourModel.h"
 #include "mitkContourModelSet.h"
 #include "mitkContourModelWriter.h"
 #include "mitkContourModelSetWriter.h"
 #include "mitkContourModelMapper2D.h"
 #include "mitkContourModelGLMapper2D.h"
 #include "mitkContourModelSetGLMapper2D.h"
 #include "mitkContourModelMapper3D.h"
 #include "mitkContourModelSetMapper3D.h"
+#include "mitkVtkGLMapperWrapper.h"
 
 
 mitk::ContourObjectFactory::ContourObjectFactory()
   : CoreObjectFactoryBase()
 {
   static bool alreadyDone = false;
   if (!alreadyDone)
   {
     MITK_DEBUG << "ContourObjectFactory c'tor" << std::endl;
 
     alreadyDone = true;
   }
 }
 
 mitk::ContourObjectFactory::~ContourObjectFactory()
 {
 }
 
 mitk::Mapper::Pointer mitk::ContourObjectFactory::CreateMapper(mitk::DataNode* node, MapperSlotId id)
 {
   mitk::Mapper::Pointer newMapper=NULL;
 
   if ( id == mitk::BaseRenderer::Standard2D )
   {
     std::string classname("ContourModel");
     if( dynamic_cast<mitk::ContourModel*>(node->GetData())!=NULL )
     {
-      newMapper = mitk::ContourModelGLMapper2D::New();
+      newMapper = mitk::VtkGLMapperWrapper::New(mitk::ContourModelGLMapper2D::New().GetPointer());
       newMapper->SetDataNode(node);
     }
     else if( dynamic_cast<mitk::ContourModelSet*>(node->GetData())!=NULL )
     {
-      newMapper = mitk::ContourModelSetGLMapper2D::New();
+      newMapper = mitk::VtkGLMapperWrapper::New(mitk::ContourModelSetGLMapper2D::New().GetPointer());
       newMapper->SetDataNode(node);
     }
   }
   else if ( id == mitk::BaseRenderer::Standard3D )
   {
     if( dynamic_cast<mitk::ContourModel*>(node->GetData())!=NULL )
     {
       newMapper = mitk::ContourModelMapper3D::New();
       newMapper->SetDataNode(node);
     }
     else if( dynamic_cast<mitk::ContourModelSet*>(node->GetData())!=NULL )
     {
       newMapper = mitk::ContourModelSetMapper3D::New();
       newMapper->SetDataNode(node);
     }
   }
   return newMapper;
 }
 
 void mitk::ContourObjectFactory::SetDefaultProperties(mitk::DataNode* node)
 {
 
   if(node==NULL)
     return;
 
   mitk::DataNode::Pointer nodePointer = node;
 
   if(node->GetData() ==NULL)
     return;
 
   if( dynamic_cast<mitk::ContourModel*>(node->GetData())!=NULL )
   {
     mitk::ContourModelGLMapper2D::SetDefaultProperties(node);
     mitk::ContourModelMapper3D::SetDefaultProperties(node);
   }
   else if( dynamic_cast<mitk::ContourModelSet*>(node->GetData())!=NULL )
   {
     mitk::ContourModelSetGLMapper2D::SetDefaultProperties(node);
     mitk::ContourModelSetMapper3D::SetDefaultProperties(node);
   }
 }
 
 const char* mitk::ContourObjectFactory::GetFileExtensions()
 {
   std::string fileExtension;
   this->CreateFileExtensions(m_FileExtensionsMap, fileExtension);
   return fileExtension.c_str();
 };
 
 mitk::CoreObjectFactoryBase::MultimapType mitk::ContourObjectFactory::GetFileExtensionsMap()
 {
   return m_FileExtensionsMap;
 }
 
 mitk::CoreObjectFactoryBase::MultimapType mitk::ContourObjectFactory::GetSaveFileExtensionsMap()
 {
   return m_SaveFileExtensionsMap;
 }
 
 void mitk::ContourObjectFactory::CreateFileExtensionsMap()
 {
 }
 
 const char* mitk::ContourObjectFactory::GetSaveFileExtensions()
 {
   std::string fileExtension;
   this->CreateFileExtensions(m_SaveFileExtensionsMap, fileExtension);
   return fileExtension.c_str();
 }
 
 void mitk::ContourObjectFactory::RegisterIOFactories()
 {
 }
 
 
 struct RegisterContourObjectFactory{
   RegisterContourObjectFactory()
     : m_Factory( mitk::ContourObjectFactory::New() )
   {
     mitk::CoreObjectFactory::GetInstance()->RegisterExtraFactory( m_Factory );
   }
 
   ~RegisterContourObjectFactory()
   {
     mitk::CoreObjectFactory::GetInstance()->UnRegisterExtraFactory( m_Factory );
   }
 
   mitk::ContourObjectFactory::Pointer m_Factory;
 };
 
 static RegisterContourObjectFactory registerContourObjectFactory;