Move to CGAL Arrangement