diff --git a/include/SimCore/Messages/SimTrack.hpp b/include/SimCore/Messages/SimTrack.hpp
index fe9085b..278ebfa 100644
--- a/include/SimCore/Messages/SimTrack.hpp
+++ b/include/SimCore/Messages/SimTrack.hpp
@@ -77,13 +77,14 @@ namespace SimCore
         Data<double> Course;
         Data<double> Pitch;
         Data<double> RCS;
+        Data<WHISPER::SourceType> SourceType;
 
         Data<SimCore::EntityKind> EntityKind;
 
     private:
         const SimCore::Identifier ID_;
 
-        WHISPER::SourceType SourceType_;
+        // WHISPER::SourceType SourceType_;
 
         Position position_;
 
diff --git a/src/SimCore/Messages/SimTrack.cpp b/src/SimCore/Messages/SimTrack.cpp
index 81aeb98..63bb3e9 100644
--- a/src/SimCore/Messages/SimTrack.cpp
+++ b/src/SimCore/Messages/SimTrack.cpp
@@ -8,7 +8,7 @@
 namespace SimCore
 {
     SimTrack::SimTrack()
-    :ID_(SimCore::Identifier()),SourceType_(WHISPER::SourceType::SIMCOMTROLER)
+    :ID_(SimCore::Identifier())
     {
       EntityKind.setValue(SimCore::EntityKind::UNKNOWN);
       
@@ -26,7 +26,7 @@ namespace SimCore
 
 
     SimTrack::SimTrack(WHISPER::SourceType sourcetype,SimCore::EntityKind entityKind)
-    :ID_(SimCore::Identifier()),SourceType_(sourcetype)
+    :ID_(SimCore::Identifier())
     {
       EntityKind.setValue(entityKind);   
       
@@ -44,7 +44,7 @@ namespace SimCore
 
     
     SimTrack::SimTrack(SimCore::Identifier id ,WHISPER::SourceType sourcetype,SimCore::EntityKind entityKind )
-    :ID_(id),SourceType_(sourcetype)
+    :ID_(id),SourceType(sourcetype)
     {
       EntityKind.setValue(entityKind);
 
@@ -85,7 +85,7 @@ namespace SimCore
 
    WHISPER::Message SimTrack::buildMessage()
    {
-    WHISPER::Message msg(ID_.getUUID(),WHISPER::MsgTopics::TRACK , WHISPER::MsgType::SIM_TRACK, this->SourceType_);
+    WHISPER::Message msg(ID_.getUUID(),WHISPER::MsgTopics::TRACK , WHISPER::MsgType::SIM_TRACK);
 
 
     messages::SimTrack::SimTrack SimTrack;
@@ -152,7 +152,7 @@ namespace SimCore
 
      if (trackMsg.has_contactsourcetype()) 
      {
-        track.SourceType_ = (WHISPER::SourceType)trackMsg.contactsourcetype();
+        track.SourceType.setValue((WHISPER::SourceType)trackMsg.contactsourcetype());
      }    
 
     if (trackMsg.has_geocentricposition())