diff --git a/data/RobotAPI/VariantInfo-RobotAPI.xml b/data/RobotAPI/VariantInfo-RobotAPI.xml
index 0fb95ad0cf6503f17f9a51877444e78bd8288bf5..4c5a3eda6cdc646f6b8bcefcc6295f0282b15e33 100644
--- a/data/RobotAPI/VariantInfo-RobotAPI.xml
+++ b/data/RobotAPI/VariantInfo-RobotAPI.xml
@@ -2,18 +2,18 @@
 <VariantInfo>
     <Lib name="RobotAPICore">
         <VariantFactory include="RobotAPI/libraries/core/RobotAPIObjectFactories.h" />
-        <Variant baseType="::armarx::Vector3Base" dataType="::armarx::Vector3" humanName="Vector3" />
-        <Variant baseType="::armarx::QuaternionBase" dataType="::armarx::Quaternion" humanName="Quaternion" />
-        <Variant baseType="::armarx::PoseBase" dataType="::armarx::Pose" humanName="Pose" />
-        <Variant baseType="::armarx::FramedPoseBase" dataType="::armarx::FramedPose" humanName="FramedPose" />
-        <Variant baseType="::armarx::FramedDirectionBase" dataType="::armarx::FramedDirection" humanName="FramedDirection" />
-        <Variant baseType="::armarx::FramedPositionBase" dataType="::armarx::FramedPosition" humanName="FramedPosition" />
-        <Variant baseType="::armarx::FramedOrientationBase" dataType="::armarx::FramedOrientation" humanName="FramedOrientation" />
-        <Variant baseType="::armarx::LinkedPoseBase" dataType="::armarx::LinkedPose" humanName="LinkedPose" />
-        <Variant baseType="::armarx::LinkedDirectionBase" dataType="::armarx::LinkedDirection" humanName="LinkedDirection" />
-        <Variant baseType="::armarx::OrientedPointBase" dataType="::armarx::OrientedPoint" humanName="OrientedPoint" />
-        <Variant baseType="::armarx::FramedOrientedPointBase" dataType="::armarx::FramedOrientedPoint" humanName="FramedOrientedPoint" />
-        <Variant baseType="::armarx::TrajectoryBase" dataType="::armarx::Trajectory" humanName="Trajectory"/>
+        <Variant baseType="::armarx::Vector3Base" dataType="::armarx::Vector3" humanName="Vector3" include="RobotAPI/libraries/core/Pose.h" />
+        <Variant baseType="::armarx::QuaternionBase" dataType="::armarx::Quaternion" humanName="Quaternion" include="RobotAPI/libraries/core/Pose.h" />
+        <Variant baseType="::armarx::PoseBase" dataType="::armarx::Pose" humanName="Pose" include="RobotAPI/libraries/core/Pose.h" />
+        <Variant baseType="::armarx::FramedPoseBase" dataType="::armarx::FramedPose" humanName="FramedPose" include="RobotAPI/libraries/core/FramedPose.h" />
+        <Variant baseType="::armarx::FramedDirectionBase" dataType="::armarx::FramedDirection" humanName="FramedDirection" include="RobotAPI/libraries/core/FramedPose.h" />
+        <Variant baseType="::armarx::FramedPositionBase" dataType="::armarx::FramedPosition" humanName="FramedPosition" include="RobotAPI/libraries/core/FramedPose.h" />
+        <Variant baseType="::armarx::FramedOrientationBase" dataType="::armarx::FramedOrientation" humanName="FramedOrientation" include="RobotAPI/libraries/core/FramedPose.h" />
+        <Variant baseType="::armarx::LinkedPoseBase" dataType="::armarx::LinkedPose" humanName="LinkedPose" include="RobotAPI/libraries/core/LinkedPose.h" />
+        <Variant baseType="::armarx::LinkedDirectionBase" dataType="::armarx::LinkedDirection" humanName="LinkedDirection" include="RobotAPI/libraries/core/LinkedPose.h" />
+        <Variant baseType="::armarx::OrientedPointBase" dataType="::armarx::OrientedPoint" humanName="OrientedPoint" include="RobotAPI/libraries/core/OrientedPoint.h" />
+        <Variant baseType="::armarx::FramedOrientedPointBase" dataType="::armarx::FramedOrientedPoint" humanName="FramedOrientedPoint" include="RobotAPI/libraries/core/FramedOrientedPoint.h" />
+        <Variant baseType="::armarx::TrajectoryBase" dataType="::armarx::Trajectory" humanName="Trajectory"  include="RobotAPI/libraries/core/Trajectory.h"/>
     </Lib>
     <Lib name="RobotAPIInterfaces">
         <Proxy include="RobotAPI/interface/units/KinematicUnitInterface.h"
@@ -29,7 +29,9 @@
             memberName="kinematicUnitObserver"
             getterName="getKinematicUnitObserver"
             propertyName="KinematicUnitObserverName"
-            propertyIsOptional="false" />
+            propertyIsOptional="false">
+            <include>ArmarXCore/observers/variant/DatafieldRef.h</include>
+        </Proxy>
         <Proxy include="RobotAPI/interface/units/PlatformUnitInterface.h"
             humanName="Platform Unit"
             typeName="PlatformUnitInterfacePrx"
@@ -44,7 +46,9 @@
             getterName="getPlatformUnitObserver"
             propertyName="PlatformUnitObserverName"
             propertyIsOptional="true"
-            propertyDefaultValue="PlatformUnitObserver" />
+            propertyDefaultValue="PlatformUnitObserver">
+            <include>ArmarXCore/observers/variant/DatafieldRef.h</include>
+        </Proxy>
         <Proxy include="RobotAPI/interface/units/InertialMeasurementUnit.h"
             humanName="Inertial Measurement Unit Observer"
             typeName="InertialMeasurementUnitObserverInterfacePrx"
@@ -60,7 +64,9 @@
             getterName="getForceTorqueObserver"
             propertyName="ForceTorqueUnitObserverName"
             propertyIsOptional="true"
-            propertyDefaultValue="ForceTorqueUnitObserver" />
+            propertyDefaultValue="ForceTorqueUnitObserver">
+            <include>ArmarXCore/observers/variant/DatafieldRef.h</include>
+        </Proxy>
         <Proxy include="RobotAPI/interface/units/TCPControlUnit.h"
             humanName="TCPControlUnit"
             typeName="TCPControlUnitInterfacePrx"