diff --git a/GPA_2/include/CGAL/GPA_2.h b/GPA_2/include/CGAL/GPA_2.h
index dc1d23901f6..6bb0c490ebb 100755
--- a/GPA_2/include/CGAL/GPA_2.h
+++ b/GPA_2/include/CGAL/GPA_2.h
@@ -25,21 +25,19 @@
 #include <CGAL/GPA_2/Point_2.h>
 #include <CGAL/GPA_2/Arc_2.h>
 
+#include <CGAL/GPA_2/GPA_2_functors.h>
+
 CGAL_BEGIN_NAMESPACE
 
 template < class CurveKernel_2 >
 class GPA_2 {
 
-// for each functor defines a member function returning an instance of this
-// functor
+// declares GPA functors and for each functor defines a member function
+// returning an instance of this functor
 #define CGAL_GPA_pred(Y,Z) \
+    typedef GPA_2_Functors::Y<Self> Y; \
     Y Z() const { return Y(); }
-    
-// makes Y alias of functor X, Z is a member function returnining an insance
-// of this object
-#define CGAL_GPA_pred(X, Y, Z) \
-    typedef X Y; \
-    Y Z() const { return Y(); }
+#define CGAL_GPA_cons(Y,Z) CGAL_GPA_pred(Y,Z)
 
 public:
     //! \name public typedefs
@@ -51,7 +49,7 @@ public:
     //! myself
     typedef GPA_2<Curve_kernel_2> Self;
     
-    //! type of a generic curve
+    //! type of general planar curve
     typedef typename Curve_kernel_2::Curve_2 Curve_2;
     
     //! type of point's x-coordinate
@@ -60,18 +58,63 @@ public:
     //! type of a finite point on curve
     typedef typename Curve_kernel_2::Xy_coordinate_2 Xy_coordinate_2;
     
+    //! provides analysis of a single curve
+    typedef typename Curve_kernel_2::Curve_analysis_2 Curve_analysis_2;
+    
+    //! provides analysis of a pair of curves
+    typedef typename Curve_kernel_2::Curve_pair_analysis_2
+            Curve_pair_analysis_2;
+    
+    //! tag specifies that "to the left of" comparisons supported
+    typedef CGAL::Tag_true Has_left_category;
+    //! tag specifies that merge and split functors supported
+    typedef CGAL::Tag_true Has_merge_category; 
+    //! tag specifies that infinite functors supported
+    typedef CGAL::Tag_true Has_infinite_category;
+    //! tag specifies that unbounded arcs are supported
+    typedef CGAL::Tag_true Has_boundary_category;
+    
     //!@}
 public:
-    //!\name embedded types and predicates
+    //!\name embedded types and predicates for \c Arrangement_2 package
     //!@{
     
     //! type of a point on generic curve
+    // or shall we alias Xy_coordinate_2 as a "finite" point to be used by
+    // ArrangementTraits_2, while Point_2 is only for internal purposes ?
     typedef CGALi::Point_2<Self> Point_2; 
     
     //! type of an arc on generic curve
     typedef CGALi::Arc_2<Self> Arc_2; 
     
+    //! type of weakly x-monotone arc for \c ArrangementTraits_2
+    typedef Arc_2 X_monotone_curve;
+
+    CGAL_GPA_pred(Compare_x_2, compare_x_2_object)  + 
+    CGAL_GPA_pred(Compare_xy_2, compare_xy_2_object)  +
+    CGAL_GPA_pred(Equal_2, equal_2_object) +
+    CGAL_GPA_pred(Is_vertical_2, is_vertical_2_object) +
+    CGAL_GPA_cons(Construct_min_vertex_2, construct_min_vertex_2_object) +
+    CGAL_GPA_cons(Construct_max_vertex_2, construct_max_vertex_2_object) +
+    CGAL_GPA_pred(Infinite_in_x_2, infinite_in_x_2_object) + ?
+    CGAL_GPA_pred(Infinite_in_y_2, infinite_in_y_2_object) + ?
+    CGAL_GPA_pred(Boundary_in_x_2, boundary_in_x_2_object) +
+    CGAL_GPA_pred(Boundary_in_y_2, boundary_in_y_2_object) +
+    CGAL_GPA_pred(Compare_y_at_x_2, compare_y_at_x_2_object) +  
+    CGAL_GPA_pred(Compare_y_at_x_left_2, compare_y_at_x_left_2_object)  +
+    CGAL_GPA_pred(Compare_y_at_x_right_2, compare_y_at_x_right_2_object) +
+        
+    //! predicates to support intersections
+    CGAL_GPA_cons(Split_2, split_2_object)  +
+    CGAL_GPA_cons(Intersect_2, intersect_2_object)
+    CGAL_GPA_cons(Make_x_monotone_2, make_x_monotone_2_object)
+    CGAL_GPA_pred(Are_mergeable_2, are_mergeable_2_object) +
+    CGAL_GPA_cons(Merge_2, merge_2_object)
     
+    /*CGAL_GPA_cons(Approximate_2, approximate_2_object)
+    CGAL_GPA_cons(Construct_x_monotone_curve_2,
+        construct_x_monotone_curve_2_object)*/
+        
     //!@}
 }; // class GPA_2