diff --git a/Modules/US/USFilters/mitkUSDevice.H b/Modules/US/USFilters/mitkUSDevice.H
index 70c8e3cd97..df17fd7601 100644
--- a/Modules/US/USFilters/mitkUSDevice.H
+++ b/Modules/US/USFilters/mitkUSDevice.H
@@ -1,81 +1,81 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 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.
 
 =========================================================================*/
 
 
 #ifndef MITKUSDevice_H_HEADER_INCLUDED_
 #define MITKUSDevice_H_HEADER_INCLUDED_
 
 #include <vector>
 #include "mitkUSProbe.h"
 #include <MitkUSExports.h>
 #include <mitkCommon.h>
-#include <itkObject.h>
+#include <mitkImageSource.h>
 #include <itkObjectFactory.h>
 
 namespace mitk {
 
     /**Documentation
-    * \brief A device holds information about it's model, make and the connected Probes. It could 
+    * \brief A device holds information about it's model, make and the connected probes.
     * \ingroup US
     */
   class MitkUS_EXPORT USDevice : public itk::Object
     {
     public:
-      mitkClassMacro(USDevice,itk::Object);
+      mitkClassMacro(USDevice,mitk::ImageSource);
       itkNewMacro(Self);
 
       /**
       * \brief Add a probe to the device without connecting to it.
       *  This should usually be done before connecting to the probe
       */
       virtual void AddProbe(mitk::USProbe::Pointer probe);
 
       /**
       * \brief Connect to a probe and activate it. The probe should be added first.
       *  Usually, a VideoDevice will just add a probe it want's to connect to,
       *  but an SDK Device might require adding a probe first.
       */
       virtual void ActivateProbe(mitk::USProbe::Pointer probe);
 
       /**
       * \brief Deactivates the currently active probe.
       */
       virtual void DeactivateProbe();
 
       /**
       * \brief Removes a probe from the ist of currently added probes.
       */
       //virtual void removeProbe(mitk::USProbe::Pointer probe);
     
       std::vector<mitk::USProbe::Pointer> GetConnectedProbes();
 
       itkGetMacro(ActiveProbe, mitk::USProbe::Pointer);
 
     protected:
       USDevice();
       virtual ~USDevice();
 
       mitk::USProbe::Pointer m_ActiveProbe;
       std::vector<mitk::USProbe::Pointer> m_ConnectedProbes;
       
 
 
     
 
     };
 } // namespace mitk
 #endif
\ No newline at end of file
diff --git a/Modules/US/USFilters/mitkUSImage.h b/Modules/US/USFilters/mitkUSImage.h
index d20d847524..fb39e6a020 100644
--- a/Modules/US/USFilters/mitkUSImage.h
+++ b/Modules/US/USFilters/mitkUSImage.h
@@ -1,51 +1,52 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 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.
 
 =========================================================================*/
 
 
 #ifndef MITKUSIMAGE_H_HEADER_INCLUDED_
 #define MITKUSIMAGE_H_HEADER_INCLUDED_
 
 #include <MitkUSExports.h>
 #include <mitkCommon.h>
 #include <mitkImage.h>
 #include "mitkUSImageMetadata.h"
 
 namespace mitk {
 
     /**Documentation
-    * \brief TODO
+    * \brief This specialization of mitk::Image only appends necessary Metadata to an MITK image. Otherwise it can safely be treated it's mother class.
     * \ingroup US
     */
   class MitkUS_EXPORT USImage : public mitk::Image
     {
     public:
       mitkClassMacro(USImage, mitk::Image);
       itkNewMacro(Self);
 
+      itkGetMacro(Metadata, mitk::USImageMetadata::Pointer);   
+      itkSetMacro(Metadata, mitk::USImageMetadata::Pointer);
+
     protected:
       USImage();
       virtual ~USImage();
-      USImageMetadata::Pointer m_Metadata;
-      
+      USImageMetadata::Pointer m_Metadata; 
       
-      //itkGetMacro(Metadata,USImageMetadata);   
-      //itkSetMacro(Metadata,USImageMetadata);
+
 
 
     };
 } // namespace mitk
 #endif
\ No newline at end of file
diff --git a/Modules/US/USFilters/mitkUSImageMetadata.h b/Modules/US/USFilters/mitkUSImageMetadata.h
index b8e813ad85..4b5e2174c1 100644
--- a/Modules/US/USFilters/mitkUSImageMetadata.h
+++ b/Modules/US/USFilters/mitkUSImageMetadata.h
@@ -1,56 +1,58 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 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.
 
 =========================================================================*/
 
 
 #ifndef MITKUSIMAGEMETADATA_H_HEADER_INCLUDED_
 #define MITKUSIMAGEMETADATA_H_HEADER_INCLUDED_
 
 #include <MitkUSExports.h>
 #include <mitkCommon.h>
 #include <itkObject.h>
+#include "mitkUSDevice.h"
+#include "mitkUSProbe.h"
 #include <itkObjectFactory.h>
 
 namespace mitk {
 
     /**Documentation
     * \brief TODO
     * \ingroup US
     */
   class MitkUS_EXPORT USImageMetadata : public itk::Object
     {
     public:
-      mitkClassMacro(USImageMetadata,itk::Object);
+      mitkClassMacro(USImageMetadata, itk::Object);
       itkNewMacro(Self);
     
       //## getter and setter ##
-      itkGetMacro(Device, std::string);
-      itkSetMacro(Device, std::string);
-      itkGetMacro(Probe, std::string);
-      itkSetMacro(Probe, std::string);
+      itkGetMacro(Device, mitk::USDevice::Pointer);
+      itkSetMacro(Device, mitk::USDevice::Pointer);
+      itkGetMacro(Probe,  mitk::USProbe::Pointer);
+      itkSetMacro(Probe,  mitk::USProbe::Pointer);
 
     protected:
       USImageMetadata();
       virtual ~USImageMetadata();
 
-      std::string m_Device;
-      std::string m_Probe;
+      USDevice::Pointer m_Device;
+      USProbe::Pointer  m_Probe;
 
     
 
     };
 } // namespace mitk
 #endif
\ No newline at end of file