diff --git a/instana/agent.py b/instana/agent.py
index f39e1d27..236cd17b 100644
--- a/instana/agent.py
+++ b/instana/agent.py
@@ -12,7 +12,7 @@
 
 class From(object):
     pid = ""
-    hostId = ""
+    agentUuid = ""
 
     def __init__(self, **kwds):
         self.__dict__.update(kwds)
diff --git a/instana/recorder.py b/instana/recorder.py
index ba15f0f8..5989897a 100644
--- a/instana/recorder.py
+++ b/instana/recorder.py
@@ -85,6 +85,9 @@ def build_registered_span(self, span):
                        baggage=span.context.baggage,
                        custom=sd.CustomData(tags=span.tags,
                                             logs=self.collect_logs(span)))
+        entityFrom = { 'e': self.sensor.agent.from_.pid,
+                       'h': self.sensor.agent.from_.agentUuid }
+
         return sd.InstanaSpan(
                     n=span.operation_name,
                     t=span.context.trace_id,
@@ -92,7 +95,7 @@ def build_registered_span(self, span):
                     s=span.context.span_id,
                     ts=int(round(span.start_time * 1000)),
                     d=int(round(span.duration * 1000)),
-                    f=self.sensor.agent.from_,
+                    f=entityFrom,
                     ec=self.get_tag(span, "ec"),
                     error=self.get_tag(span, "error"),
                     data=data)
@@ -110,9 +113,9 @@ def build_sdk_span(self, span):
         )
 
         sdk_data.Type = self.get_span_kind(span)
-
-        data = sd.Data(service=self.get_service_name(span),
-                       sdk=sdk_data)
+        data = sd.Data(service=self.get_service_name(span), sdk=sdk_data)
+        entityFrom = { 'e': self.sensor.agent.from_.pid,
+                       'h': self.sensor.agent.from_.agentUuid }
 
         return sd.InstanaSpan(
                     t=span.context.trace_id,
@@ -121,7 +124,7 @@ def build_sdk_span(self, span):
                     ts=int(round(span.start_time * 1000)),
                     d=int(round(span.duration * 1000)),
                     n="sdk",
-                    f=self.sensor.agent.from_,
+                    f=entityFrom,
                     data=data)
 
     def get_tag(self, span, tag):