diff --git a/apps/DoseTool/DoseToolHelper.cpp b/apps/DoseTool/DoseToolHelper.cpp
index 7fea082..80260c5 100644
--- a/apps/DoseTool/DoseToolHelper.cpp
+++ b/apps/DoseTool/DoseToolHelper.cpp
@@ -1,201 +1,201 @@
 // -----------------------------------------------------------------------
 // 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.
 //
 //------------------------------------------------------------------------
 
 #include "DoseToolHelper.h"
 
 #include "boost/make_shared.hpp"
 #include "boost/shared_ptr.hpp"
 #include "boost/property_tree/ptree.hpp"
 #include "boost/property_tree/xml_parser.hpp"
 #include "boost/filesystem.hpp"
 
 #include "DoseToolApplicationData.h"
 #include "rttbDicomFileStructureSetGenerator.h"
 #include "rttbITKImageFileMaskAccessorGenerator.h"
 #include "rttbDoseStatistics.h"
 #include "rttbDVH.h"
 #include "rttbDVHCalculator.h"
 #include "rttbDVHXMLFileWriter.h"
 #include "rttbDoseStatisticsCalculator.h"
 #include "rttbBoostMaskAccessor.h"
 #include "rttbGenericMaskedDoseIterator.h"
 #include "rttbDoseStatisticsXMLWriter.h"
 
 
 std::vector<rttb::core::MaskAccessorInterface::MaskAccessorPointer> rttb::apps::doseTool::generateMasks(rttb::apps::doseTool::ApplicationData& appData) {
 	
 	std::vector<core::MaskAccessorInterface::MaskAccessorPointer> maskAccessorPtrVector;
 
 	if (appData._structLoadStyle == "itk" || appData._structLoadStyle == "itkDicom") {
 		maskAccessorPtrVector.push_back(rttb::io::itk::ITKImageFileMaskAccessorGenerator(appData._structFileName).generateMaskAccessor());
         appData._structNames.push_back(appData._structNameRegex);
 	} else {
 		if (appData._struct->getNumberOfStructures() > 0) {
 			//default behavior: read only first struct that matches the regex
 			unsigned int maxIterationCount = 1;
 
 			//only if specified: read all structs that matches the regex
 			if (appData._multipleStructsMode) {
 				maxIterationCount = appData._struct->getNumberOfStructures();
 			}
 
 			 bool strict = !appData._allowSelfIntersection;
 
 			for (size_t i = 0; i < maxIterationCount; i++) {
 				maskAccessorPtrVector.emplace_back(boost::make_shared<rttb::masks::boost::BoostMaskAccessor>(appData._struct->getStructure(i), appData._dose->getGeometricInfo(), strict));
 				maskAccessorPtrVector.at(i)->updateMask();
 				appData._structNames.push_back(appData._struct->getStructure(i)->getLabel());
 			}
 		} else {
 			std::cout << "no structures in structure set!" << std::endl;
 		}
 	}
 
 	return maskAccessorPtrVector;
 }
 
 rttb::core::DoseIteratorInterface::DoseIteratorPointer rttb::apps::doseTool::generateMaskedDoseIterator(
 	rttb::core::MaskAccessorInterface::MaskAccessorPointer maskAccessorPtr,
     rttb::core::DoseAccessorInterface::DoseAccessorPointer doseAccessorPtr) {
 
 	boost::shared_ptr<core::GenericMaskedDoseIterator> maskedDoseIterator = boost::make_shared<core::GenericMaskedDoseIterator>(maskAccessorPtr, doseAccessorPtr);
 	rttb::core::DoseIteratorInterface::DoseIteratorPointer doseIterator(maskedDoseIterator);
 	return doseIterator;
 }
 
 rttb::algorithms::DoseStatistics::DoseStatisticsPointer calculateDoseStatistics(
     rttb::core::DoseIteratorInterface::DoseIteratorPointer doseIterator, 
 	bool calculateComplexDoseStatistics,
     rttb::DoseTypeGy prescribedDose) {
 
 	rttb::algorithms::DoseStatisticsCalculator doseStatsCalculator(doseIterator);
 
 	if (calculateComplexDoseStatistics) {
 		return doseStatsCalculator.calculateDoseStatistics(prescribedDose);
 	} else {
 		return doseStatsCalculator.calculateDoseStatistics();
 	}
 }
 
 
 rttb::core::DVH::DVHPointer calculateDVH(rttb::core::DoseIteratorInterface::DoseIteratorPointer doseIterator, rttb::IDType structUID, rttb::IDType doseUID) {
 	rttb::core::DVHCalculator calc(doseIterator, structUID, doseUID);
 	rttb::core::DVH::DVHPointer dvh = calc.generateDVH();
 	return dvh;
 }
 
 std::string rttb::apps::doseTool::assembleFilenameWithStruct(const std::string& originalFilename, const std::string& structName) {
     boost::filesystem::path originalFile(originalFilename);
     std::string newFilename = originalFile.stem().string() + "_" + structName + originalFile.extension().string();
     boost::filesystem::path newFile(originalFile.parent_path() / newFilename);
     return newFile.string();
 }
 
 /*! @brief Writes the dose statistics as XML to a file
 @details adds a <config>....</config> part to the RTTB generated xml where the used files and struct names are stored.
 */
 void writeDoseStatisticsFile(rttb::algorithms::DoseStatistics::DoseStatisticsPointer statistics, 
 	const std::string& filename, 
 	const std::string& structName,
     rttb::apps::doseTool::ApplicationData& appData) {
 
 	auto doseStatisticsXMLWriter = rttb::io::other::DoseStatisticsXMLWriter();
 
 	boost::property_tree::ptree originalTree = doseStatisticsXMLWriter.writeDoseStatistics(statistics);
 
 	//add config part to xml
 	originalTree.add("statistics.config.requestedStructRegex", appData._structNameRegex);
 	originalTree.add("statistics.config.structName", structName);
 	originalTree.add("statistics.config.doseUID", appData._dose->getUID());
 	originalTree.add("statistics.config.doseFile", appData._doseFileName);
 	originalTree.add("statistics.config.structFile", appData._structFileName);
 
 	boost::property_tree::ptree reorderedTree, configTree, resultsTree;
 	configTree = originalTree.get_child("statistics.config");
 	resultsTree = originalTree.get_child("statistics.results");
 	reorderedTree.add_child("statistics.config", configTree);
 	reorderedTree.add_child("statistics.results", resultsTree);
 
 	boost::property_tree::write_xml(filename, reorderedTree, std::locale(),  boost::property_tree::xml_writer_make_settings<std::string>('\t', 1));
 }
 
 void writeDVHFile(rttb::core::DVH::DVHPointer dvh, const std::string& filename) {
 	rttb::DVHType typeCum = { rttb::DVHType::Cumulative };
 	rttb::io::other::DVHXMLFileWriter dvhWriter(filename, typeCum);
 	dvhWriter.writeDVH(dvh);
 }
 
 void rttb::apps::doseTool::processData(rttb::apps::doseTool::ApplicationData& appData) {
     std::cout << std::endl << "generating masks... ";
     std::vector<core::MaskAccessorInterface::MaskAccessorPointer> maskAccessorPtrVector = generateMasks(appData);
     std::cout << "done." << std::endl;
 
     for (size_t i = 0; i < maskAccessorPtrVector.size(); i++) {
         core::DoseIteratorInterface::DoseIteratorPointer spDoseIterator(generateMaskedDoseIterator(
             maskAccessorPtrVector.at(i),
             appData._dose));
 
         if (appData._computeDoseStatistics) {
             std::cout << std::endl << "computing dose statistics... ";
             algorithms::DoseStatistics::DoseStatisticsPointer statistics = calculateDoseStatistics(
                 spDoseIterator,
                 appData._computeComplexDoseStatistics, appData._prescribedDose);
             std::cout << "done." << std::endl;
 
             std::cout << std::endl << "writing dose statistics to file... ";
             std::string outputFilename;
 
             if (appData._multipleStructsMode) {
                 outputFilename = assembleFilenameWithStruct(appData._doseStatisticOutputFileName,
                     appData._structNames.at(i));
             } else {
                 outputFilename = appData._doseStatisticOutputFileName;
             }
 
             writeDoseStatisticsFile(statistics, outputFilename, appData._structNames.at(i), appData);
             std::cout << "done." << std::endl;
         }
 
         if (appData._computeDVH) {
             std::cout << std::endl << "computing DVH... ";
             rttb::IDType structUID;
             rttb::IDType doseUID;
 
             //Generate random UID
             if (appData._structLoadStyle == "itk") {
-                structUID = "struct42";
-                doseUID = "dose42";
+                structUID = "struct.fromVoxelizedITK";
+                doseUID = "dose.fromVoxelizedITK";
             } else {
                 structUID = appData._struct->getUID();
                 doseUID = appData._dose->getUID();
             }
 
             core::DVH::DVHPointer dvh = calculateDVH(spDoseIterator, structUID, doseUID);
             std::cout << "done." << std::endl;
 
             std::cout << std::endl << "writing DVH to file... ";
             std::string outputFilename;
 
             if (appData._multipleStructsMode) {
                 outputFilename = assembleFilenameWithStruct(appData._dvhOutputFilename, appData._structNames.at(i));
             } else {
                 outputFilename = appData._dvhOutputFilename;
             }
 
             writeDVHFile(dvh, outputFilename);
             std::cout << "done." << std::endl;
         }
     }
 }
diff --git a/code/core/files.cmake b/code/core/files.cmake
index aa6dba0..a10deda 100644
--- a/code/core/files.cmake
+++ b/code/core/files.cmake
@@ -1,65 +1,57 @@
 SET(CPP_FILES 
   rttbAccessorWithGeoInfoBase.cpp
   rttbDoseIteratorInterface.cpp
   rttbDVH.cpp
   rttbDVHCalculator.cpp
   rttbDVHSet.cpp
-  rttbDataNotAvailableException.cpp
-  rttbException.cpp		
   rttbGenericDoseIterator.cpp
   rttbGenericMaskedDoseIterator.cpp
   rttbGeometricInfo.cpp
-  rttbIndexOutOfBoundsException.cpp
-  rttbInvalidDoseException.cpp
-  rttbInvalidParameterException.cpp
-  rttbMappingOutsideOfImageException.cpp
   rttbMaskedDoseIteratorInterface.cpp
   rttbMaskVoxel.cpp
-  rttbNullPointerException.cpp
-  rttbPaddingException.cpp
   rttbStructure.cpp
   rttbStructureSet.cpp
   rttbStrVectorStructureSetGenerator.cpp
   rttbUtils.cpp
   )
 
 SET(H_FILES 
   rttbAccessorInterface.h
   rttbAccessorWithGeoInfoBase.h
   rttbBaseType.h
   rttbDataNotAvailableException.h
   rttbDoseAccessorInterface.h
   rttbDoseIteratorInterface.h
   rttbDoseAccessorGeneratorBase.h
   rttbDoseAccessorGeneratorInterface.h
   rttbDVH.h
   rttbDVHCalculator.h
   rttbDVHGeneratorInterface.h
   rttbDVHSet.h
   rttbException.h
   rttbExceptionMacros.h
   rttbGenericDoseIterator.h
   rttbGenericMaskedDoseIterator.h
   rttbGeometricInfo.h
   rttbIndexConversionInterface.h
   rttbIndexOutOfBoundsException.h
   rttbInvalidDoseException.h
   rttbInvalidParameterException.h
   rttbMappingOutsideOfImageException.h
   rttbMaskAccessorGeneratorBase.h
   rttbMaskAccessorGeneratorInterface.h
   rttbMaskAccessorInterface.h
   rttbMaskAccessorProcessorBase.h
   rttbMaskAccessorProcessorInterface.h
   rttbMaskedDoseIteratorInterface.h
   rttbMaskVoxel.h
   rttbMutableDoseAccessorInterface.h
   rttbMutableMaskAccessorInterface.h
   rttbNullPointerException.h
   rttbPaddingException.h
   rttbStructure.h
   rttbStructureSet.h
   rttbStructureSetGeneratorInterface.h
   rttbStrVectorStructureSetGenerator.h
   rttbUtils.h
 )
diff --git a/code/core/rttbDataNotAvailableException.cpp b/code/core/rttbDataNotAvailableException.cpp
deleted file mode 100644
index 09b2cca..0000000
--- a/code/core/rttbDataNotAvailableException.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbDataNotAvailableException.h"
-
-namespace rttb
-{
-	namespace core
-	{
-
-		const char* DataNotAvailableException::what() const throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* DataNotAvailableException::GetNameOfClass() const
-		{
-			return "DataNotAvailableException";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbDataNotAvailableException.h b/code/core/rttbDataNotAvailableException.h
index 942b418..2de51df 100644
--- a/code/core/rttbDataNotAvailableException.h
+++ b/code/core/rttbDataNotAvailableException.h
@@ -1,60 +1,49 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __DATA_NOT_AVAILABLE_EXCEPTION_H
 #define __DATA_NOT_AVAILABLE_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 
 #include "RTTBCoreExports.h"
 
 
 namespace rttb
 {
 	namespace core
 	{
 
 		/*! @class DataNotAvailableException
 			@brief This exception will be thrown if the requested data is not available.
 		*/
 		class RTTBCore_EXPORT DataNotAvailableException : public Exception
 		{
 		public:
 			DataNotAvailableException(const std::string& aWhat) : Exception(aWhat) {}
-
-			~DataNotAvailableException() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class
-			*/
-			virtual const char* GetNameOfClass() const;
 		};
 
 	}
 }
 
 #endif
diff --git a/code/core/rttbException.cpp b/code/core/rttbException.cpp
deleted file mode 100644
index f2271cc..0000000
--- a/code/core/rttbException.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbException.h"
-
-namespace rttb
-{
-	namespace core
-	{
-
-		const char* Exception::what() const  throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* Exception::GetNameOfClass() const
-		{
-			return "Exception";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbException.h b/code/core/rttbException.h
index fab03ec..e9728b2 100644
--- a/code/core/rttbException.h
+++ b/code/core/rttbException.h
@@ -1,63 +1,50 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
-#ifndef __EXCEPTION_H
-#define __EXCEPTION_H
+#ifndef __RTTBEXCEPTION_H
+#define __RTTBEXCEPTION_H
 
 #include <string>
-#include <exception>
-#include <iostream>
+#include <stdexcept>
 
 #include "RTTBCoreExports.h"
 
 namespace rttb
 {
 	namespace core
 	{
 
 		/*! @class Exception
 			@brief Exception interface used by all RTToolbox exceptions.
 		*/
 
-		class RTTBCore_EXPORT Exception : public std::exception
+		class RTTBCore_EXPORT Exception : public std::runtime_error
 		{
-		protected:
-			std::string rttb_what;
-
 		public:
-			explicit Exception(const std::string& aWhat)
-				: rttb_what(aWhat)
-			{}
-			~Exception() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class that was thrown
-			*/
-			const char* GetNameOfClass() const;
+			Exception(const std::string& aWhat)
+				: runtime_error(aWhat)
+			{};
 		};
 
 	}
 }
 
 #endif
diff --git a/code/core/rttbIndexOutOfBoundsException.cpp b/code/core/rttbIndexOutOfBoundsException.cpp
deleted file mode 100644
index d21f802..0000000
--- a/code/core/rttbIndexOutOfBoundsException.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbIndexOutOfBoundsException.h"
-
-namespace rttb
-{
-	namespace core
-	{
-
-		const char* IndexOutOfBoundsException::what() const throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* IndexOutOfBoundsException::GetNameOfClass() const
-		{
-			return "IndexOutOfBoundsException";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbIndexOutOfBoundsException.h b/code/core/rttbIndexOutOfBoundsException.h
index fe626fe..33dcdf3 100644
--- a/code/core/rttbIndexOutOfBoundsException.h
+++ b/code/core/rttbIndexOutOfBoundsException.h
@@ -1,58 +1,47 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __INDEX_OUT_OF_BOUNDS_EXCEPTION_H
 #define __INDEX_OUT_OF_BOUNDS_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 #include "RTTBCoreExports.h"
 
 namespace rttb
 {
 
 	namespace core
 	{
 
 		/*! @class IndexOutOfBoundsException
 			@brief This exception will be thrown if any index out of bound.
 		*/
         class RTTBCore_EXPORT IndexOutOfBoundsException : public Exception
 		{
 		public:
 			IndexOutOfBoundsException(const std::string& aWhat): Exception(aWhat) {}
-
-			~IndexOutOfBoundsException() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class
-			*/
-			virtual const char* GetNameOfClass() const;
 		};
 
 	}
 }
 #endif
diff --git a/code/core/rttbInvalidDoseException.cpp b/code/core/rttbInvalidDoseException.cpp
deleted file mode 100644
index de222c7..0000000
--- a/code/core/rttbInvalidDoseException.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbInvalidDoseException.h"
-
-namespace rttb
-{
-
-	namespace core
-	{
-
-		const char* InvalidDoseException::what() const throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* InvalidDoseException::GetNameOfClass() const
-		{
-			return "InvalidDoseException";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbInvalidDoseException.h b/code/core/rttbInvalidDoseException.h
index 0a7d16a..84a9e4a 100644
--- a/code/core/rttbInvalidDoseException.h
+++ b/code/core/rttbInvalidDoseException.h
@@ -1,59 +1,48 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __INVALID_DOSE_EXCEPTION_H
 #define __INVALID_DOSE_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 
 #include "RTTBCoreExports.h"
 
 namespace rttb
 {
 	namespace core
 	{
 
 		/*! @class InvalidDoseException
 			@brief This exception will be thrown if dose is invalid.
 		*/
 		class RTTBCore_EXPORT InvalidDoseException : public Exception
 		{
 		public:
 			InvalidDoseException(const std::string& aWhat): Exception(aWhat) {}
-
-			~InvalidDoseException() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class
-			*/
-			virtual const char* GetNameOfClass() const;
 		};
 
 	}
 }
 
 #endif
diff --git a/code/core/rttbInvalidParameterException.cpp b/code/core/rttbInvalidParameterException.cpp
deleted file mode 100644
index ab7e762..0000000
--- a/code/core/rttbInvalidParameterException.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbInvalidParameterException.h"
-
-namespace rttb
-{
-	namespace core
-	{
-
-		const char* InvalidParameterException::what() const throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* InvalidParameterException::GetNameOfClass() const
-		{
-			return "InvalidParameterException";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbInvalidParameterException.h b/code/core/rttbInvalidParameterException.h
index 6e45f92..e3b2aad 100644
--- a/code/core/rttbInvalidParameterException.h
+++ b/code/core/rttbInvalidParameterException.h
@@ -1,58 +1,47 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __INVALID_PARAMETER_EXCEPTION_H
 #define __INVALID_PARAMETER_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 
 #include "RTTBCoreExports.h"
 
 namespace rttb
 {
 	namespace core
 	{
 
 		/*! @class InvalidParameterException
 			@brief This exception will be thrown if any parameter is invalid.
 		*/
 		class RTTBCore_EXPORT InvalidParameterException : public Exception
 		{
 		public:
 			InvalidParameterException(const std::string& aWhat): Exception(aWhat) {}
-
-			~InvalidParameterException() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class
-			*/
-			virtual const char* GetNameOfClass() const;
 		};
 
 	}
 }
 #endif
diff --git a/code/core/rttbMappingOutsideOfImageException.cpp b/code/core/rttbMappingOutsideOfImageException.cpp
deleted file mode 100644
index bddaaa8..0000000
--- a/code/core/rttbMappingOutsideOfImageException.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbMappingOutsideOfImageException.h"
-
-namespace rttb
-{
-	namespace core
-	{
-
-		const char* MappingOutsideOfImageException::what() const throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* MappingOutsideOfImageException::GetNameOfClass() const
-		{
-			return "MappingOutsideOfImageException";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbMappingOutsideOfImageException.h b/code/core/rttbMappingOutsideOfImageException.h
index 5a52c6b..e5d0b8a 100644
--- a/code/core/rttbMappingOutsideOfImageException.h
+++ b/code/core/rttbMappingOutsideOfImageException.h
@@ -1,60 +1,49 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __MAPPING_OUTSIDE_OF_IMAGE_EXCEPTION_H
 #define __MAPPING_OUTSIDE_OF_IMAGE_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 
 #include "RTTBCoreExports.h"
 
 
 namespace rttb
 {
 	namespace core
 	{
 
 		/*! @class MappingOutsideOfImageException
 			@brief This exception will be thrown if a transformation leads to an invalid position outside of the image.
 		*/
 		class RTTBCore_EXPORT MappingOutsideOfImageException : public Exception
 		{
 		public:
 			MappingOutsideOfImageException(const std::string& aWhat): Exception(aWhat) {}
-
-			~MappingOutsideOfImageException() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class
-			*/
-			virtual const char* GetNameOfClass() const;
 		};
 
 	}
 }
 
 #endif
diff --git a/code/core/rttbNullPointerException.cpp b/code/core/rttbNullPointerException.cpp
deleted file mode 100644
index 5af4c2d..0000000
--- a/code/core/rttbNullPointerException.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbNullPointerException.h"
-
-namespace rttb
-{
-	namespace core
-	{
-
-		const char* NullPointerException::what() const throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* NullPointerException::GetNameOfClass() const
-		{
-			return "NullPointerException";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbNullPointerException.h b/code/core/rttbNullPointerException.h
index 0454383..3de5e2f 100644
--- a/code/core/rttbNullPointerException.h
+++ b/code/core/rttbNullPointerException.h
@@ -1,60 +1,47 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __NULL_POINTER_EXCEPTION_H
 #define __NULL_POINTER_EXCEPTION_H
 
 #include <string>
-#include <exception>
-
 #include "rttbException.h"
 
 #include "RTTBCoreExports.h"
 
 
 namespace rttb
 {
 	namespace core
 	{
 
 		/*! @class NullPointerException
 			@brief This exception will be thrown if any pointer is nullptr.
 		*/
-		class RTTBCore_EXPORT NullPointerException : public Exception
-		{
+		class RTTBCore_EXPORT NullPointerException : public Exception {
 		public:
 			NullPointerException(const std::string& aWhat): Exception(aWhat) {}
-
-			~NullPointerException() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class
-			*/
-			virtual const char* GetNameOfClass() const;
 		};
 
 	}
 }
 
 #endif
diff --git a/code/core/rttbPaddingException.cpp b/code/core/rttbPaddingException.cpp
deleted file mode 100644
index 0d3e883..0000000
--- a/code/core/rttbPaddingException.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <iostream>
-#include <sstream>
-
-#include "rttbPaddingException.h"
-
-namespace rttb
-{
-	namespace core
-	{
-
-		const char* PaddingException::what() const throw()
-		{
-			return rttb_what.c_str();
-		}
-
-		const char* PaddingException::GetNameOfClass() const
-		{
-			return "PaddingException";
-		}
-
-	}//end namespace core
-}//end namespace rttb
diff --git a/code/core/rttbPaddingException.h b/code/core/rttbPaddingException.h
index e7d4a05..0d76de0 100644
--- a/code/core/rttbPaddingException.h
+++ b/code/core/rttbPaddingException.h
@@ -1,58 +1,47 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __PADDING_EXCEPTION_H
 #define __PADDING_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 
 
 namespace rttb
 {
 	namespace core
 	{
 
 		/*! @class PaddingException
 			@brief This exception will be thrown if it can't be guaranteed that a transformation covers only a part of the target space.
 		*/
 		class PaddingException: public Exception
 		{
 		public:
 			PaddingException(const std::string& aWhat): Exception(aWhat) {}
-
-			~PaddingException() throw() override = default;
-
-			/*! @brief Get the exception description
-			*/
-			const char* what() const throw() override;
-
-			/*! @brief Get the name of the exception class
-			*/
-			virtual const char* GetNameOfClass() const;
 		};
 
 	}
 }
 
 #endif
diff --git a/code/io/dicom/files.cmake b/code/io/dicom/files.cmake
index 587b85f..0af7e8c 100644
--- a/code/io/dicom/files.cmake
+++ b/code/io/dicom/files.cmake
@@ -1,23 +1,22 @@
 SET(CPP_FILES 
-  rttbDcmrtException.cpp
   rttbDicomDoseAccessor.cpp
   rttbDicomFileDoseAccessorGenerator.cpp
   rttbDicomFileDoseAccessorWriter.cpp
   rttbDicomFileReaderHelper.cpp
   rttbDicomFileStructureSetGenerator.cpp
   rttbDicomIODDoseAccessorGenerator.cpp
   rttbDicomIODStructureSetGenerator.cpp
   rttbDVHDicomFileReader.cpp
   )
 
 SET(H_FILES 
   rttbDcmrtException.h
   rttbDicomDoseAccessor.h
   rttbDicomFileDoseAccessorGenerator.h
   rttbDicomFileDoseAccessorWriter.h
   rttbDicomFileReaderHelper.h
   rttbDicomFileStructureSetGenerator.h
   rttbDicomIODDoseAccessorGenerator.h
   rttbDicomIODStructureSetGenerator.h
   rttbDVHDicomFileReader.h
 )
diff --git a/code/io/dicom/rttbDcmrtException.cpp b/code/io/dicom/rttbDcmrtException.cpp
deleted file mode 100644
index 45d315f..0000000
--- a/code/io/dicom/rttbDcmrtException.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <sstream>
-
-#include "rttbDcmrtException.h"
-
-namespace rttb
-{
-	namespace io
-	{
-		namespace dicom
-		{
-			const char* DcmrtException::what() const throw()
-			{
-				return rttb_what.c_str();
-			}
-
-			const char* DcmrtException::GetNameOfClass() const
-			{
-				return "DcmrtException";
-			}
-		}
-
-	}//end namespace io
-}//end namespace rttb
diff --git a/code/io/dicom/rttbDcmrtException.h b/code/io/dicom/rttbDcmrtException.h
index 5d90748..1707420 100644
--- a/code/io/dicom/rttbDcmrtException.h
+++ b/code/io/dicom/rttbDcmrtException.h
@@ -1,60 +1,49 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __DCMRT_EXCEPTION_H
 #define __DCMRT_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 
 namespace rttb
 {
 	namespace io
 	{
 		namespace dicom
 		{
 
 			/*! @class DcmrtException
 			@brief This class represents a DcmrtException. Any dcmrt error will throw this exception.
 			*/
 			class DcmrtException: public core::Exception
 			{
 			public:
 				DcmrtException(const std::string& aWhat): Exception(aWhat) {}
-
-				~DcmrtException() throw() override = default;
-
-				/*! @brief Get the exception description
-				*/
-				const char* what() const throw() override;
-
-				/*! @brief Get the name of the class that was thrown
-				*/
-				const char* GetNameOfClass() const;
 			};
 		}
 	}
 
 }
 
 #endif
diff --git a/code/io/itk/files.cmake b/code/io/itk/files.cmake
index ff05187..56e4ece 100644
--- a/code/io/itk/files.cmake
+++ b/code/io/itk/files.cmake
@@ -1,41 +1,40 @@
 SET(CPP_FILES 
 	rttbFileDispatch.cpp
 	rttbGenericImageReader.cpp
 	rttbImageWriter.cpp
-	rttbITKException.cpp
 	rttbITKImageAccessor.cpp
 	rttbITKImageAccessorConverter.cpp
 	rttbITKImageAccessorGenerator.cpp
 	rttbITKImageFileAccessorGenerator.cpp
 	rttbITKImageFileMaskAccessorGenerator.cpp
 	rttbITKImageMaskAccessor.cpp
 	rttbITKImageMaskAccessorGenerator.cpp
 	rttbITKImageMaskAccessorConverter.cpp
 	rttbITKIOHelper.cpp
 	itkDoseAccessorImageFilter.cpp
 	itkMaskAccessorImageSource.cpp
   )
 
 SET(H_FILES 
 	rttbDoseAccessorConversionSettingInterface.h
 	rttbDoseAccessorProcessorBase.h
 	rttbDoseAccessorProcessorInterface.h
 	rttbFileDispatch.h
 	rttbGenericImageReader.h
 	rttbImageReader.h
 	rttbImageReader.tpp
 	rttbImageWriter.h
 	rttbITKException.h
 	rttbITKImageAccessor.h
 	rttbITKImageAccessorConverter.h
 	rttbITKImageAccessorGenerator.h
 	rttbITKImageFileAccessorGenerator.h
 	rttbITKImageFileMaskAccessorGenerator.h
 	rttbITKImageMaskAccessor.h
 	rttbITKImageMaskAccessorConverter.h
 	rttbITKImageMaskAccessorGenerator.h
 	rttbITKIOHelper.h
 	rttbITKIOHelper.tpp
 	itkDoseAccessorImageFilter.h
 	itkMaskAccessorImageSource.h
 )
diff --git a/code/io/itk/rttbITKException.cpp b/code/io/itk/rttbITKException.cpp
deleted file mode 100644
index 4335913..0000000
--- a/code/io/itk/rttbITKException.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// -----------------------------------------------------------------------
-// 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 <sstream>
-
-#include "rttbITKException.h"
-
-namespace rttb
-{
-	namespace io
-	{
-		namespace itk
-		{
-			const char* ITKException::what() const throw()
-			{
-				return rttb_what.c_str();
-			}
-
-			const char* ITKException::GetNameOfClass() const
-			{
-				return "ITKException";
-			}
-		}
-
-	}//end namespace io
-}//end namespace rttb
diff --git a/code/io/itk/rttbITKException.h b/code/io/itk/rttbITKException.h
index b823957..0cfb43b 100644
--- a/code/io/itk/rttbITKException.h
+++ b/code/io/itk/rttbITKException.h
@@ -1,60 +1,49 @@
 // -----------------------------------------------------------------------
 // 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)
 */
 
 #ifndef __ITK_EXCEPTION_H
 #define __ITK_EXCEPTION_H
 
 #include <string>
-#include <exception>
 
 #include "rttbException.h"
 
 namespace rttb
 {
 	namespace io
 	{
 		namespace itk
 		{
 
 			/*! @class ITKException
 			@brief This class represents a ITKException. Any itk error will throw this exception.
 			*/
 			class ITKException: public core::Exception
 			{
 			public:
 				ITKException(const std::string& aWhat): Exception(aWhat) {}
-
-				~ITKException() throw() override = default;
-
-				/*! @brief Get the exception description
-				*/
-				const char* what() const throw() override;
-
-				/*! @brief Get the name of the class that was thrown
-				*/
-				const char* GetNameOfClass() const;
 			};
 		}
 	}
 
 }
 
 #endif
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index d4777ad..0f6eab8 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -1,113 +1,113 @@
 MESSAGE(STATUS "processing RTToolbox testing code")
 
 # Testing branch
 PROJECT(RTTBTesting)
 
 #-----------------------------------------------------------------------------
 # extract and build Litmus
 #-----------------------------------------------------------------------------
 
 include(ExternalProject)
 message(STATUS "Litmus will be automatically downloaded and built.")
 set(LITMUS_SOURCE_DIR "${CMAKE_BINARY_DIR}/external/Litmus-src")
 set(LITMUS_BUILD_DIR "${CMAKE_BINARY_DIR}/external/Litmus-build")
 set(LITMUS_CMAKE_DIR "${CMAKE_BINARY_DIR}/external/Litmus-cmake")
 
 IF (BUILD_Tester_All OR (BUILD_Tester_Interpolation AND BUILD_InterpolationMatchPointTransformation) OR (BUILD_Tester_IO AND BUILD_IO_ITK) OR (BUILD_Tester_Apps))
 	set(ENABLE_ITK "-DLIT_ENABLE_ITK_SUPPORT:BOOL=ON")
 	set(ITK_DIRECTORY "-DITK_DIR:PATH=${ITK_DIR}")
 	IF (RTTB_USE_SYSTEM_HDF5)
 		set(SYSTEM_HDF5 "-DLIT_USE_SYSTEM_HDF5:BOOL=ON")
 		set(LITMUS_HDF5_DIR "-DHDF5_DIR:PATH=${HDF5_DIR}")
 	ENDIF()
 ENDIF()
 #extract and build Litmus
 ExternalProject_Add(
 	Litmus
 	URL ${RTToolbox_SOURCE_DIR}/utilities/Litmus/Litmus.tar.gz
 	URL_HASH SHA1=7ae626ec8fb2a6990ace12a58cf307dc48b65fac
 	SOURCE_DIR ${LITMUS_SOURCE_DIR}
 	BINARY_DIR ${LITMUS_BUILD_DIR}
 	PREFIX ${LITMUS_CMAKE_DIR}
 	INSTALL_COMMAND ""
 	UPDATE_COMMAND "" # Don't update SVN on every build
 	CMAKE_ARGS 
 		-DBUILD_TESTING:BOOL=OFF
 		-DCMAKE_CXX_STANDARD=11
 		${ENABLE_ITK}
 		${ITK_DIRECTORY}
 		${SYSTEM_HDF5}
 		${LITMUS_HDF5_DIR}
 )
 
 set(RTTBDATA_DIR "${CMAKE_BINARY_DIR}/external/RTTBData")
 set(TEST_DATA_ROOT ${RTTBDATA_DIR})
 
 #download RTTB data
 message(STATUS "RTTBdata will be automatically downloaded.")
 ExternalProject_Add(
 	RTTBData
     SOURCE_DIR ${RTTBDATA_DIR}
-    GIT_REPOSITORY "ssh://git@phabricator.mitk.org:2222/source/rttb-data.git"
+    GIT_REPOSITORY "https://phabricator.mitk.org/source/rttb-data.git"
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND ""
 	INSTALL_COMMAND ""
   )
 
 #-----------------------------------------------------------------------------
 # Configure Testing branch
 #-----------------------------------------------------------------------------
 MAKE_DIRECTORY(${RTTBTesting_BINARY_DIR}/Temporary)
 
 OPTION(BUILD_Tester_All "All testing modules will be built" OFF)
 
 MESSAGE(STATUS "Process All Tests...")
 
 #-----------------------------------------------------------------------------
 # Include sub directories
 #-----------------------------------------------------------------------------
 OPTION(BUILD_Tester_Core "build project on/off" OFF)
 OPTION(BUILD_Tester_Examples "build project on/off" OFF)
 OPTION(BUILD_Tester_Algorithms "build project on/off" OFF)
 OPTION(BUILD_Tester_Models "build project on/off" OFF)
 OPTION(BUILD_Tester_IO "build project on/off" OFF)
 OPTION(BUILD_Tester_Masks "build project on/off" OFF)
 OPTION(BUILD_Tester_Interpolation "build project on/off" OFF)
 OPTION(BUILD_Tester_Apps "build project on/off" OFF)
 OPTION(BUILD_Tester_Validation "build project on/off" OFF)
 
 IF(BUILD_Tester_All OR BUILD_Tester_Core)
 	ADD_SUBDIRECTORY(core)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Examples)
 	ADD_SUBDIRECTORY(examples)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Algorithms)
 	ADD_SUBDIRECTORY(algorithms)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Models)
 	ADD_SUBDIRECTORY(models)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_IO)
 	ADD_SUBDIRECTORY(io)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Masks)
 	ADD_SUBDIRECTORY(masks)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Interpolation)
 	ADD_SUBDIRECTORY(interpolation)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Validation)
 	ADD_SUBDIRECTORY(validation)
 ENDIF()
 
 IF(BUILD_Tester_All OR BUILD_Tester_Apps)
 	ADD_SUBDIRECTORY(apps)
 ENDIF()
diff --git a/testing/apps/DoseTool/CMakeLists.txt b/testing/apps/DoseTool/CMakeLists.txt
index a7e53ea..eb75ad3 100644
--- a/testing/apps/DoseTool/CMakeLists.txt
+++ b/testing/apps/DoseTool/CMakeLists.txt
@@ -1,35 +1,37 @@
 #-----------------------------------------------------------------------------
 # Setup the system information test.  Write out some basic failsafe
 # information in case the test doesn't run.
 #-----------------------------------------------------------------------------
 
 SET(DOSETOOL_TEST ${EXECUTABLE_OUTPUT_PATH}/rttbDoseToolTests)
 
 SET(TEMP ${RTTBTesting_BINARY_DIR}/temporary)
 
 
 #-----------------------------------------------------------------------------
 
 IF(MSVC)
      ADD_DEFINITIONS(/bigobj)
 ENDIF()
 
 IF (WIN32)
 	SET(DOSETOOLEXE "DoseTool.exe")
 ELSE (WIN32)
 	SET(DOSETOOLEXE "./DoseTool")
 ENDIF (WIN32)
 
 ADD_TEST(DoseToolInvalidParametersTest ${DOSETOOL_TEST} DoseToolInvalidParametersTest ${DOSETOOLEXE})
 ADD_TEST(DoseToolDicomDoseDicomStructTest ${DOSETOOL_TEST} DoseToolDicomDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom.xml" "${TEST_DATA_ROOT}/DVH/XML/dicompylerDVH.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/dicomComplex.xml")
+ADD_TEST(DoseToolDicomDoseVoxelizedStructTest ${DOSETOOL_TEST} DoseToolDicomDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/ITK/voxelizedNodes.nrrd" ""
+"${TEST_DATA_ROOT}/DoseStatistics/XML/dicom.xml" "${TEST_DATA_ROOT}/DVH/XML/dicompylerDVH_voxelizedITK.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/dicomComplex.xml")
 ADD_TEST(DoseToolITKDoseDicomStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/ITK/dicompylerTestDose.mhd" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml" "dicomOutput.xml" "dicomOutputComplex.xml")
 ADD_TEST(DoseToolITKDoseITKStructTest ${DOSETOOL_TEST} DoseToolITKDoseTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/ITK/dicompylerTestDose.mhd" "${TEST_DATA_ROOT}/StructureSet/ITK/voxelizedNodes.nrrd" "Nodes"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStruct.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/itkDicomStructComplex.xml" "itkOutput.xml" "itkOutputComplex.xml")
 ADD_TEST(DoseToolDicomDoseDicomStructRegexTest ${DOSETOOL_TEST} DoseToolRegexTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "dicom" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "dicom" "Nodes|Heart"
 "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom.xml" "${TEST_DATA_ROOT}/DoseStatistics/XML/dicom_heart.xml")
 ADD_TEST(DoseToolDVHTest ${DOSETOOL_TEST} DoseToolDVHTest ${DOSETOOLEXE} "${TEST_DATA_ROOT}/Dose/DICOM/dicompylerTestDose.dcm" "${TEST_DATA_ROOT}/StructureSet/DICOM/rtss.dcm" "Nodes"
 "${TEST_DATA_ROOT}/DVH/XML/dicompylerDVH.xml")
 
 RTTB_CREATE_APPLICATION_TESTS(DoseTool DEPENDS RTTBOtherIO PACKAGE_DEPENDS Litmus BoostBinaries RTTBData)