diff --git a/Code/Common/otbDataNode.h b/Code/Common/otbDataNode.h
index d21077bc7ecae8b00c8d69ce23ecc6b353268e5a..baae05a8580a1798d8ffd5343fcda5882f5649a7 100644
--- a/Code/Common/otbDataNode.h
+++ b/Code/Common/otbDataNode.h
@@ -19,7 +19,7 @@
 #define  __otb_DataNode_h
 
 #include "itkPoint.h"
-#include "itkPolyLineParametricPath.h"
+#include "otbPolyLineParametricPathWithValue.h"
 #include "otbPolygon.h"
 #include "otbObjectList.h"
 
@@ -67,7 +67,7 @@ class DataNode
 
    /** Internal data typedef */
    typedef itk::Point<PrecisionType,VDimension>       PointType;
-   typedef itk::PolyLineParametricPath<VDimension>    LineType;
+   typedef otb::PolyLineParametricPathWithValue<double,VDimension>    LineType;
    typedef typename LineType::Pointer                 LinePointerType;
    typedef Polygon<PrecisionType>                     PolygonType;
    typedef typename PolygonType::Pointer              PolygonPointerType; 
@@ -121,18 +121,18 @@ class DataNode
     * Set the line data. Node type is automatically set to FEATURE_LINE.
     * \param line The line.
     */
-   void SetLine(LinePointerType line);
+   void SetLine(LineType* line);
    /**
     * Set the polygon exterior ring. Node type is automatically set to FEATURE_POLYGON.
     * \param polygon The polygon exterior ring.
     */
-   void SetPolygonExteriorRing(PolygonPointerType polygon);
+   void SetPolygonExteriorRing(PolygonType* polygon);
 
    /**
     * Set the polygon interior rings. Node type is automatically set to FEATURE_POLYGON.
     * \param polygonList The polygon interior rings list.
     */
-   void SetPolygonInteriorRings(PolygonListPointerType polygonList);
+   void SetPolygonInteriorRings(PolygonListType* polygonList);
 
    /**
     * \return True if node type is DOCUMENT.
diff --git a/Code/Common/otbDataNode.txx b/Code/Common/otbDataNode.txx
index c698320afe743fede3802fd73c592634d762586f..38fea41e1d0c70853770d42dbb7e4968ce5faee2 100644
--- a/Code/Common/otbDataNode.txx
+++ b/Code/Common/otbDataNode.txx
@@ -52,7 +52,7 @@ DataNode<TPrecision,VDimension>
 
 template <class TPrecision, unsigned int VDimension>
   void DataNode<TPrecision,VDimension>
-::SetLine(LinePointerType line)
+::SetLine(LineType* line)
 {
   m_NodeType = FEATURE_LINE;
   m_Data.line = line;
@@ -61,7 +61,7 @@ template <class TPrecision, unsigned int VDimension>
 template <class TPrecision, unsigned int VDimension> 
  void 
 DataNode<TPrecision,VDimension>
-::SetPolygonExteriorRing(PolygonPointerType polygon)
+::SetPolygonExteriorRing(PolygonType* polygon)
 {
   m_NodeType = FEATURE_POLYGON;
   m_Data.exteriorRing = polygon;
@@ -75,7 +75,7 @@ DataNode<TPrecision,VDimension>
 template <class TPrecision, unsigned int VDimension> 
  void 
 DataNode<TPrecision,VDimension>
-::SetPolygonInteriorRings(PolygonListPointerType polygonList)
+  ::SetPolygonInteriorRings(PolygonListType* polygonList)
 {
   m_NodeType = FEATURE_POLYGON;
   m_Data.interiorRings = polygonList;
diff --git a/Code/Common/otbObjectList.h b/Code/Common/otbObjectList.h
index 38f38c7879e632ef7561799dc150fbca030c47df..ee9d51575448e2258581b66e4896b382147ddd46 100644
--- a/Code/Common/otbObjectList.h
+++ b/Code/Common/otbObjectList.h
@@ -75,7 +75,7 @@ public:
    * Append an element to the list.
    * \param element Pointer to the element to append.
    */
-  void PushBack(ObjectPointerType element);
+  void PushBack(ObjectType* element);
   /**
    * Set the nth element of the list.
    * \param index The index where to put the element.
diff --git a/Code/Common/otbObjectList.txx b/Code/Common/otbObjectList.txx
index 0806ec9eee96dc3e29c75d9b15b476cd1476d330..58ee9321a59cb7ee7b20e4f2929d0903491bc013 100644
--- a/Code/Common/otbObjectList.txx
+++ b/Code/Common/otbObjectList.txx
@@ -80,7 +80,7 @@ namespace otb
   template <class TObject>
   void 
   ObjectList<TObject>
-  ::PushBack(ObjectPointerType element)
+  ::PushBack(ObjectType* element)
   {
     m_InternalContainer.push_back(element);
   }