diff --git a/code/io/itk/itkMaskAccessorImageSource.h b/code/io/itk/itkMaskAccessorImageSource.h
index 59b6235..51a20b9 100644
--- a/code/io/itk/itkMaskAccessorImageSource.h
+++ b/code/io/itk/itkMaskAccessorImageSource.h
@@ -1,115 +1,111 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // This software is distributed WITHOUT ANY WARRANTY; without even
 // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.  See the above copyright notices for more information.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision: 1221 $ (last changed revision)
 // @date    $Date: 2015-12-01 13:43:31 +0100 (Di, 01 Dez 2015) $ (last change date)
 // @author  $Author: hentsch $ (last changed by)
 */
 
 #ifndef __itkMaskAccessorImageSource_h
 #define __itkMaskAccessorImageSource_h
 
 #include "itkGenerateImageSource.h"
-#include "itkImageIterator.h"
 
 #include "rttbMaskAccessorInterface.h"
 #include "rttbITKImageMaskAccessor.h"
 
 namespace itk
 {
 	/** \class MaskAccessorImageSource
 	 * \brief Converts a given mask accessor into an itk image.
 	 *
 	 */
 
   typedef rttb::io::itk::ITKImageMaskAccessor::ITKMaskImageType RTTBMaskImageType;
 
 	class ITK_EXPORT MaskAccessorImageSource:
     public GenerateImageSource< RTTBMaskImageType>
 
 	{
 	public:
 		/** Standard class typedefs. */
 		typedef MaskAccessorImageSource                          Self;
     typedef GenerateImageSource< RTTBMaskImageType > Superclass;
 		typedef SmartPointer< Self >                            Pointer;
 		typedef SmartPointer< const Self >                      ConstPointer;
 		/** Method for creation through the object factory. */
 		itkNewMacro(Self);
 
 		/** Run-time type information (and related methods). */
 		itkTypeMacro(MaskAccessorImageSource, ImageToImageFilter);
 
 		/** Some typedefs. */
     typedef RTTBMaskImageType           OutputImageType;
 		typedef OutputImageType::Pointer    OutputImagePointer;
 		typedef OutputImageType::RegionType OutputImageRegionType;
 		typedef OutputImageType::PixelType  OutputImagePixelType;
 
 		typedef rttb::core::MaskAccessorInterface AccessorType;
     typedef rttb::core::MaskAccessorInterface::MaskAccessorPointer AccessorPointer;
 
 		/** Get the accessor pointer. */
-    AccessorPointer GetAccessor()
-		{
-			return m_Accessor;
-		}
+    itkGetConstMacro(Accessor, AccessorPointer);
 
 		/** Set the accessor pointer. */
     void SetAccessor(AccessorPointer accessor)
 		{
 			if (m_Accessor != accessor)
 			{
 				m_Accessor = accessor;
 				this->Modified();
 			}
 		}
 
     itkSetMacro(FailsOnInvalidIDs, bool);
     itkGetConstMacro(FailsOnInvalidIDs, bool);
 
     itkSetMacro(InvalidMaskValue, OutputImageType::ValueType);
     itkGetConstMacro(InvalidMaskValue, OutputImageType::ValueType);
 
 		/** ImageDimension constants */
 		itkStaticConstMacro(
 		    OutputImageDimension, unsigned int, OutputImageType::ImageDimension);
 
 	protected:
 		MaskAccessorImageSource();
 		virtual ~MaskAccessorImageSource() {}
 
 		void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread,
 		                          ThreadIdType threadId);
 
     virtual void BeforeThreadedGenerateData();
 
 	private:
 		MaskAccessorImageSource(const Self&);  //purposely not implemented
 		void operator=(const Self&);          //purposely not implemented
 
     typedef std::map <rttb::VoxelGridID, rttb::core::MaskAccessorInterface::MaskVoxelList::size_type> VoxelMapType;
     VoxelMapType m_idMap;
     rttb::core::MaskAccessorInterface::MaskVoxelListPointer m_MaskedVoxels;
 
     AccessorPointer m_Accessor;
     bool m_FailsOnInvalidIDs;
     OutputImageType::ValueType m_InvalidMaskValue;
 	};
 } // end namespace itk
 
 
 #endif
diff --git a/code/io/itk/rttbITKImageMaskAccessorConverter.cpp b/code/io/itk/rttbITKImageMaskAccessorConverter.cpp
index c777f42..381526a 100644
--- a/code/io/itk/rttbITKImageMaskAccessorConverter.cpp
+++ b/code/io/itk/rttbITKImageMaskAccessorConverter.cpp
@@ -1,95 +1,93 @@
 // -----------------------------------------------------------------------
 // RTToolbox - DKFZ radiotherapy quantitative evaluation library
 //
 // Copyright (c) German Cancer Research Center (DKFZ),
 // Software development for Integrated Diagnostics and Therapy (SIDT).
 // ALL RIGHTS RESERVED.
 // See rttbCopyright.txt or
 // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html
 //
 // This software is distributed WITHOUT ANY WARRANTY; without even
 // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 // PURPOSE.  See the above copyright notices for more information.
 //
 //------------------------------------------------------------------------
 /*!
 // @file
 // @version $Revision$ (last changed revision)
 // @date    $Date$ (last change date)
 // @author  $Author$ (last changed by)
 */
 
 
 #include <boost/shared_ptr.hpp>
 
 #include "rttbITKImageMaskAccessorConverter.h"
-#include "rttbInvalidDoseException.h"
 #include "rttbGeometricInfo.h"
-#include "itkImageRegionIterator.h"
 #include "rttbITKImageMaskAccessor.h"
 #include "itkMaskAccessorImageSource.h"
 
 namespace rttb
 {
 	namespace io
 	{
 		namespace itk
 		{
 			ITKImageMaskAccessorConverter::ITKImageMaskAccessorConverter(MaskAccessorPointer accessor)
 			{
 				setMaskAccessor(accessor);
 			}
 
 			bool ITKImageMaskAccessorConverter::process()
 			{
 				//Transfer GeometricInfo to ITK Properties
 				core::GeometricInfo geoInfo = _maskAccessor->getGeometricInfo();
 
 				ITKImageMaskAccessor::ITKMaskImageType::IndexType start = {{0, 0, 0}};
 
 				ITKImageMaskAccessor::ITKMaskImageType::SizeType size = {{geoInfo.getNumColumns(), geoInfo.getNumRows(), geoInfo.getNumSlices()}};
 
 				ITKImageMaskAccessor::ITKMaskImageType::SpacingType spacing;
 				for (unsigned int i = 0; i < 3; ++i)
 				{
 					spacing[i] = geoInfo.getSpacing()[i];
 				}
 
 				ITKImageMaskAccessor::ITKMaskImageType::PointType origin;
 
 				for (unsigned int i = 0; i < 3; ++i)
 				{
 					origin[i] = geoInfo.getImagePositionPatient()[i];
 				}
 
 				ITKImageMaskAccessor::ITKMaskImageType::DirectionType direction;
 				OrientationMatrix OM = geoInfo.getOrientationMatrix();
 
 				for (unsigned int col = 0; col < 3; ++col)
 				{
 					for (unsigned int row = 0; row < 3; ++row)
 					{
 						direction(col, row) = OM(col, row);
 					}
 				}
 
         ::itk::MaskAccessorImageSource::Pointer imagesource = ::itk::MaskAccessorImageSource::New();
 
         imagesource->SetSize(size);
         imagesource->SetSpacing(spacing);
         imagesource->SetDirection(direction);
         imagesource->SetOrigin(origin);
         imagesource->SetAccessor(_maskAccessor);
         imagesource->SetFailsOnInvalidIDs(failsOnInvalidIDs());
         imagesource->SetInvalidMaskValue(_invalidDoseValue);
         imagesource->Update();
         _itkImage = imagesource->GetOutput();
 
 				return true;
 			}
 
 
 		}//end namespace mask
 	}//end namespace io
 }//end namespace rttb