diff --git a/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomReader.cpp b/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomReader.cpp
index 0de308d..3661330 100644
--- a/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomReader.cpp
+++ b/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomReader.cpp
@@ -1,180 +1,180 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center.
 
 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 "mitkFiberBundleDicomReader.h"
 #include <itkMetaDataObject.h>
 #include <vtkPolyData.h>
 #include <vtkDataReader.h>
 #include <vtkPolyDataReader.h>
 #include <vtkMatrix4x4.h>
 #include <vtkPolyLine.h>
 #include <vtkCellArray.h>
 #include <vtkDataArray.h>
 #include <vtkFloatArray.h>
 #include <vtkCellData.h>
 #include <vtkPointData.h>
 #include <itksys/SystemTools.hxx>
 #include <tinyxml.h>
 #include <vtkCleanPolyData.h>
 #include <mitkTrackvis.h>
 #include <mitkCustomMimeType.h>
 #include "mitkDiffusionIOMimeTypes.h"
 #include <vtkTransformPolyDataFilter.h>
 #include <mitkLexicalCast.h>
 
 #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
 #include "dcmtk/dcmtract/trctractographyresults.h"
 #include "dcmtk/dcmtract/trctrack.h"
 
 mitk::FiberBundleDicomReader::FiberBundleDicomReader()
   : mitk::AbstractFileReader( mitk::DiffusionIOMimeTypes::FIBERBUNDLE_DICOM_MIMETYPE_NAME(), "DICOM Fiber Bundle Reader" )
 {
   m_ServiceReg = this->RegisterService();
 }
 
 mitk::FiberBundleDicomReader::FiberBundleDicomReader(const FiberBundleDicomReader &other)
   :mitk::AbstractFileReader(other)
 {
 }
 
 mitk::FiberBundleDicomReader * mitk::FiberBundleDicomReader::Clone() const
 {
   return new FiberBundleDicomReader(*this);
 }
 
 std::vector<itk::SmartPointer<mitk::BaseData> > mitk::FiberBundleDicomReader::Read()
 {
 
   std::vector<itk::SmartPointer<mitk::BaseData> > output_fibs;
   try
   {
     const std::string& locale = "C";
     const std::string& currLocale = setlocale( LC_ALL, nullptr );
     setlocale(LC_ALL, locale.c_str());
 
     std::string filename = this->GetInputLocation();
 
     OFCondition result;
     TrcTractographyResults *trc = nullptr;
     result = TrcTractographyResults::loadFile(filename.c_str(), trc);
     if (result.bad())
       mitkThrow() << "Unable to load tractography dicom file: " << result.text();
 
     OFString val = "-";
     trc->getPatient().getPatientName(val);
     MITK_INFO << "Patient Name: " <<  val; val = "-";
     trc->getStudy().getStudyInstanceUID(val);
     MITK_INFO << "Study       : " << val; val = "-";
     trc->getSeries().getSeriesInstanceUID(val);
     MITK_INFO << "Series      : " << val; val = "-";
     trc->getSOPCommon().getSOPInstanceUID(val);
     MITK_INFO << "Instance    : " << val; val = "-";
     MITK_INFO << "-------------------------------------------------------------------------";
     size_t numTrackSets = trc->getNumberOfTrackSets();
     OFVector<TrcTrackSet*>& sets = trc->getTrackSets();
     for (size_t ts = 0; ts < numTrackSets; ts++)
     {
       size_t numTracks = sets[ts]->getNumberOfTracks();
       MITK_INFO << "  Track Set #" << ts << ": " << numTracks << " Tracks, "
            << sets[ts]->getNumberOfTrackSetStatistics() << " Track Set Statistics, "
            << sets[ts]->getNumberOfTrackStatistics() << " Track Statistics, "
            << sets[ts]->getNumberOfMeasurements() << " Measurements ";
 
       vtkSmartPointer<vtkPoints> vtkNewPoints = vtkSmartPointer<vtkPoints>::New();
       vtkSmartPointer<vtkCellArray> vtkNewCells = vtkSmartPointer<vtkCellArray>::New();
 
       for (size_t t = 0; t < numTracks; t++)
       {
         vtkSmartPointer<vtkPolyLine> container = vtkSmartPointer<vtkPolyLine>::New();
         TrcTrack* track = sets[ts]->getTracks()[t];
         const Float32* vals = nullptr;
         size_t numPoints = track->getTrackData(vals);
 
         for (size_t v = 0; v < numPoints; ++v)
         {
           vtkIdType id = vtkNewPoints->InsertNextPoint(vals[v*3],vals[v*3+1],vals[v*3+2]);
           container->GetPointIds()->InsertNextId(id);
         }
 
         vtkNewCells->InsertNextCell(container);
       }
 
       vtkSmartPointer<vtkPolyData> fiberPolyData = vtkSmartPointer<vtkPolyData>::New();
       fiberPolyData->SetPoints(vtkNewPoints);
       fiberPolyData->SetLines(vtkNewCells);
 
 //      // transform polydata from RAS (MRtrix) to LPS (MITK)
 //      mitk::Geometry3D::Pointer geometry = mitk::Geometry3D::New();
 //      vtkSmartPointer< vtkMatrix4x4 > matrix = vtkSmartPointer< vtkMatrix4x4 >::New();
 //      matrix->Identity();
 //      matrix->SetElement(0,0,-matrix->GetElement(0,0));
 //      matrix->SetElement(1,1,-matrix->GetElement(1,1));
 //      geometry->SetIndexToWorldTransformByVtkMatrix(matrix);
 
 //      vtkSmartPointer<vtkTransformPolyDataFilter> transformFilter = vtkSmartPointer<vtkTransformPolyDataFilter>::New();
 //      transformFilter->SetInputData(fiberPolyData);
 //      transformFilter->SetTransform(geometry->GetVtkTransform());
 //      transformFilter->Update();
 
       FiberBundle::Pointer fib = FiberBundle::New(fiberPolyData);
 
-      CodeSequenceMacro* algoCode = sets[ts]->getTrackingAlgorithmIdentification().at(0);
-      val = "-"; algoCode->getCodeValue(val);
+      CodeSequenceMacro algoCode = sets[ts]->getTrackingAlgorithmIdentification().at(0)->getAlgorithmNameCode();
+      val = "-"; algoCode.getCodeValue(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.algo_code.value",val.c_str());
-      val = "-"; algoCode->getCodeMeaning(val);
+      val = "-"; algoCode.getCodeMeaning(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.algo_code.meaning",val.c_str());
 
       CodeSequenceMacro modelCode = sets[ts]->getDiffusionModelCode();
       val = "-"; modelCode.getCodeValue(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.model_code.value",val.c_str());
       val = "-"; modelCode.getCodeMeaning(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.model_code.meaning",val.c_str());
 
       CodeWithModifiers anatomy = sets[ts]->getTrackSetAnatomy();
       val = "-"; anatomy.getCodeValue(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.anatomy.value",val.c_str());
       val = "-"; anatomy.getCodeMeaning(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.anatomy.meaning",val.c_str());
 
       val = "-"; trc->getPatient().getPatientID(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.patient_id",val.c_str());
       val = "-"; trc->getPatient().getPatientName(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.patient_name",val.c_str());
       val = "-"; trc->getStudy().getStudyInstanceUID(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.study_instance_uid",val.c_str());
       val = "-"; trc->getSeries().getSeriesInstanceUID(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.series_instance_uid",val.c_str());
       val = "-"; trc->getSOPCommon().getSOPInstanceUID(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.sop_instance_uid",val.c_str());
       val = "-"; trc->getSOPCommon().getSOPClassUID(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.sop_class_uid",val.c_str());
       val = "-"; trc->getFrameOfReference().getFrameOfReferenceUID(val);
       fib->GetPropertyList()->SetStringProperty("DICOM.frame_of_reference_uid",val.c_str());
 
       output_fibs.push_back(fib.GetPointer());
       MITK_INFO << "Fiber bundle read";
     }
     delete trc;
 
     setlocale(LC_ALL, currLocale.c_str());
     return output_fibs;
   }
   catch(...)
   {
     throw;
   }
   return output_fibs;
 }
diff --git a/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomWriter.cpp b/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomWriter.cpp
index c9c7829..6dbeeaf 100644
--- a/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomWriter.cpp
+++ b/Modules/DiffusionIO/ReaderWriter/mitkFiberBundleDicomWriter.cpp
@@ -1,187 +1,191 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center.
 
 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 "mitkFiberBundleDicomWriter.h"
 #include <vtkSmartPointer.h>
 #include <itksys/SystemTools.hxx>
 #include <itkSize.h>
 #include <vtkFloatArray.h>
 #include <vtkCellData.h>
 #include <vtkPointData.h>
 #include <mitkAbstractFileWriter.h>
 #include <mitkCustomMimeType.h>
 #include "mitkDiffusionIOMimeTypes.h"
 #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
 #include "dcmtk/dcmtract/trctractographyresults.h"
 
 mitk::FiberBundleDicomWriter::FiberBundleDicomWriter()
   : mitk::AbstractFileWriter(mitk::FiberBundle::GetStaticNameOfClass(), mitk::DiffusionIOMimeTypes::FIBERBUNDLE_DICOM_MIMETYPE_NAME(), "DICOM Fiber Bundle Writer")
 {
   RegisterService();
 }
 
 mitk::FiberBundleDicomWriter::FiberBundleDicomWriter(const mitk::FiberBundleDicomWriter & other)
   :mitk::AbstractFileWriter(other)
 {}
 
 mitk::FiberBundleDicomWriter::~FiberBundleDicomWriter()
 {}
 
 mitk::FiberBundleDicomWriter * mitk::FiberBundleDicomWriter::Clone() const
 {
   return new mitk::FiberBundleDicomWriter(*this);
 }
 
 void mitk::FiberBundleDicomWriter::Write()
 {
   try
   {
     mitk::FiberBundle::ConstPointer fib = dynamic_cast<const mitk::FiberBundle*>(this->GetInput());
     vtkPolyData* poly = fib->GetFiberPolyData();
     mitk::PropertyList* p_list = fib->GetPropertyList();
 
     std::string patient_id = "";
     if (!p_list->GetStringProperty("DICOM.patient_id", patient_id))
       patient_id = "-";
     std::string patient_name = "";
     if (!p_list->GetStringProperty("DICOM.patient_name", patient_name))
       patient_name = "-";
     std::string study_instance_uid = "";
     if (!p_list->GetStringProperty("DICOM.study_instance_uid", study_instance_uid))
       study_instance_uid = "-";
     std::string series_instance_uid = "";
     if (!p_list->GetStringProperty("DICOM.series_instance_uid", series_instance_uid))
       series_instance_uid = "-";
     std::string sop_instance_uid = "";
     if (!p_list->GetStringProperty("DICOM.sop_instance_uid", sop_instance_uid))
       sop_instance_uid = "-";
     std::string frame_of_reference_uid = "";
     if (!p_list->GetStringProperty("DICOM.frame_of_reference_uid", frame_of_reference_uid))
       frame_of_reference_uid = "-";
     std::string algo_code_value = "";
     if (!p_list->GetStringProperty("DICOM.algo_code.value", algo_code_value))
       algo_code_value = "-";
     std::string algo_code_meaning = "";
     if (!p_list->GetStringProperty("DICOM.algo_code.meaning", algo_code_meaning))
       algo_code_meaning = "-";
     std::string model_code_value = "";
     if (!p_list->GetStringProperty("DICOM.model_code.value", model_code_value))
       model_code_value = "-";
     std::string model_code_meaning = "";
     if (!p_list->GetStringProperty("DICOM.model_code.meaning", model_code_meaning))
       model_code_meaning = "-";
     std::string anatomy_value = "";
     if (!p_list->GetStringProperty("DICOM.anatomy.value", anatomy_value))
       anatomy_value = "-";
     std::string anatomy_meaning = "";
     if (!p_list->GetStringProperty("DICOM.anatomy.meaning", anatomy_meaning))
       anatomy_meaning = "-";
 
     const std::string& locale = "C";
     const std::string& currLocale = setlocale( LC_ALL, nullptr );
     setlocale(LC_ALL, locale.c_str());
 
     // Instance Number, Label, Description, Creator's Name
     ContentIdentificationMacro id("1", "TRACTOGRAM", "Tractogram processed with MITK Diffusion", "MIC@DKFZ");
 
     // Manufacturer, model name, serial number, software version(s)
     IODEnhGeneralEquipmentModule::EquipmentInfo equipment("MIC@DKFZ", "dcmtract library", "0815", OFFIS_DCMTK_VERSION_STRING);
     IODReferences refs;
 
     // We need at least one image reference this Tractography Results object is based on.
     // We provide: Patient ID, Study Instance UID, Series Instance UID, SOP Instance UID, SOP Class UID
     IODImageReference* ref = new IODImageReference(patient_id.c_str(), study_instance_uid.c_str(), series_instance_uid.c_str(), sop_instance_uid.c_str(), UID_MRImageStorage);
     refs.add(ref);
 
     std::time_t t = std::time(nullptr);
     char date_buffer[20];
     std::strftime(date_buffer, sizeof(date_buffer), "%Y%m%d", std::gmtime(&t));
     char time_buffer[20];
     std::strftime(time_buffer, sizeof(time_buffer), "%H%M%S", std::gmtime(&t));
     OFString contentDate(date_buffer);
     OFString contentTime(time_buffer);
 
     OFString val = "-";
     TrcTractographyResults *trc = nullptr;
     TrcTractographyResults::create(id, contentDate, contentTime, equipment, refs, trc);
     trc->getStudy().setStudyInstanceUID(study_instance_uid.c_str());
     trc->getSeries().setSeriesInstanceUID(series_instance_uid.c_str());
     trc->getSOPCommon().setSOPInstanceUID(sop_instance_uid.c_str());
     trc->getSeries().getSeriesInstanceUID(val);
 
     // Create track set
     CodeWithModifiers anatomy("");
     anatomy.set(anatomy_value.c_str(), "SRT", anatomy_meaning.c_str());
 
     // Every CodeSequenceMacro has: Code Value, Coding Scheme Designator, Code Meaning
     CodeSequenceMacro diffusionModel(model_code_value.c_str(), "DCM", model_code_meaning.c_str());
-    CodeSequenceMacro algorithmId(algo_code_value.c_str(), "DCM", algo_code_meaning.c_str());
+//    CodeSequenceMacro algorithmId(algo_code_value.c_str(), "DCM", algo_code_meaning.c_str());
+
+    AlgorithmIdentificationMacro algorithmId;
+    algorithmId.setAlgorithmName(algo_code_meaning);
+
     TrcTrackSet *set = nullptr;
     trc->addTrackSet("TRACTOGRAM", "Tractogram processed with MITK Diffusion", anatomy, diffusionModel, algorithmId, set);
 
     // Create trackset
     Uint16 cieLabColor[3]; // color the whole track with this color; we use some blue
     cieLabColor[0] = 30000; // L
     cieLabColor[1] = 0 ; // a
     cieLabColor[2] = 0 ; // b
     std::vector< Float32* > tracts;
 
     for (unsigned int i=0; i<fib->GetNumFibers(); i++)
     {
         vtkCell* cell = poly->GetCell(i);
         int numPoints = cell->GetNumberOfPoints();
         vtkPoints* points = cell->GetPoints();
 
         Float32* pointData = new Float32[numPoints*3];
         for(int i=0; i<numPoints ;i++)
         {
             double* p = points->GetPoint(i);
 
             pointData[i*3] = p[0];
             pointData[i*3+1] = p[1];
             pointData[i*3+2] = p[2];
         }
         tracts.push_back(pointData);
 
         TrcTrack* track = nullptr;
         set->addTrack(pointData, numPoints, cieLabColor, 1 /* numColors */, track);
     }
 
     // Frame of Reference is required; could be the same as from related MR series
     trc->getFrameOfReference().setFrameOfReferenceUID(frame_of_reference_uid.c_str());
 
     // Set some optional data
     trc->getPatient().setPatientID(patient_id.c_str());
     trc->getPatient().setPatientName(patient_name.c_str());
     trc->getSeries().setSeriesDescription("Tractogram processed with MITK Diffusion");
 
     // Save file
     OFCondition result = trc->saveFile(this->GetOutputLocation().c_str());
     delete trc;
     if (result.bad())
       mitkThrow() << "Unable to save tractography as DICOM file: " << result.text();
 
     for (Float32* tract : tracts)
       delete [] tract;
 
     setlocale(LC_ALL, currLocale.c_str());
     MITK_INFO << "DICOM Fiber bundle written to " << this->GetOutputLocation();
   }
   catch(...)
   {
     throw;
   }
 }