diff --git a/include/Topology/generic/traversor1.h b/include/Topology/generic/traversor1.h
index a79cc7371de890c4454260611aea7553ec07499c..efd1512120c05db116eef83dc70b9a54987b8107 100644
--- a/include/Topology/generic/traversor1.h
+++ b/include/Topology/generic/traversor1.h
@@ -34,47 +34,6 @@ namespace CGoGN
 					VERTEX CENTERED TRAVERSALS
 *******************************************************************************/
 
-// Traverse all the vertices of the map
-template <typename MAP>
-class TraversorV
-{
-private:
-	MAP& m ;
-	DartMarker mark ;
-	Dart current ;
-
-public:
-	TraversorV(MAP& map, Dart dart) : m(map), mark(map)
-	{}
-
-	Dart begin()
-	{
-		mark.unmarkAll() ;
-		current = m.begin() ;
-		if(current == m.end())
-			current = NIL ;
-		else
-			mark.markOrbit(VERTEX, current) ;
-		return current ;
-	}
-	Dart end() { return NIL ; }
-	Dart next()
-	{
-		if(current != NIL)
-		{
-			while(current != NIL && mark.isMarked(current))
-			{
-				m.next(current) ;
-				if(current == m.end())
-					current = NIL ;
-			}
-			if(current != NIL)
-				mark.markOrbit(VERTEX, current) ;
-		}
-		return current ;
-	}
-} ;
-
 // Traverse the edges incident to a given vertex
 template <typename MAP>
 class Traversor1VE
@@ -152,47 +111,6 @@ public:
 					EDGE CENTERED TRAVERSALS
 *******************************************************************************/
 
-// Traverse all the vertices of the map
-template <typename MAP>
-class TraversorE
-{
-private:
-	MAP& m ;
-	DartMarker mark ;
-	Dart current ;
-
-public:
-	TraversorE(MAP& map, Dart dart) : m(map), mark(map)
-	{}
-
-	Dart begin()
-	{
-		mark.unmarkAll() ;
-		current = m.begin() ;
-		if(current == m.end())
-			current = NIL ;
-		else
-			mark.markOrbit(EDGE, current) ;
-		return current ;
-	}
-	Dart end() { return NIL ; }
-	Dart next()
-	{
-		if(current != NIL)
-		{
-			while(current != NIL && mark.isMarked(current))
-			{
-				m.next(current) ;
-				if(current == m.end())
-					current = NIL ;
-			}
-			if(current != NIL)
-				mark.markOrbit(EDGE, current) ;
-		}
-		return current ;
-	}
-} ;
-
 // Traverse the vertices incident to a given edge
 template <typename MAP>
 class Traversor1EV
diff --git a/include/Topology/generic/traversor2.h b/include/Topology/generic/traversor2.h
index 1f98ce60fef5b9047965111fc5a23a0b946f1f4a..03dcde6a39e346a3c5abb07bd4e5fc2521b5b838 100644
--- a/include/Topology/generic/traversor2.h
+++ b/include/Topology/generic/traversor2.h
@@ -34,47 +34,6 @@ namespace CGoGN
 					VERTEX CENTERED TRAVERSALS
 *******************************************************************************/
 
-// Traverse all the vertices of the map
-template <typename MAP>
-class TraversorV
-{
-private:
-	MAP& m ;
-	DartMarker mark ;
-	Dart current ;
-
-public:
-	TraversorV(MAP& map, Dart dart) : m(map), mark(map)
-	{}
-
-	Dart begin()
-	{
-		mark.unmarkAll() ;
-		current = m.begin() ;
-		if(current == m.end())
-			current = NIL ;
-		else
-			mark.markOrbit(VERTEX, current) ;
-		return current ;
-	}
-	Dart end() { return NIL ; }
-	Dart next()
-	{
-		if(current != NIL)
-		{
-			while(current != NIL && mark.isMarked(current))
-			{
-				m.next(current) ;
-				if(current == m.end())
-					current = NIL ;
-			}
-			if(current != NIL)
-				mark.markOrbit(VERTEX, current) ;
-		}
-		return current ;
-	}
-} ;
-
 // Traverse the edges incident to a given vertex
 template <typename MAP>
 class Traversor2VE
@@ -210,47 +169,6 @@ public:
 					EDGE CENTERED TRAVERSALS
 *******************************************************************************/
 
-// Traverse all the edges of the map
-template <typename MAP>
-class TraversorE
-{
-private:
-	MAP& m ;
-	DartMarker mark ;
-	Dart current ;
-
-public:
-	TraversorE(MAP& map, Dart dart) : m(map), mark(map)
-	{}
-
-	Dart begin()
-	{
-		mark.unmarkAll() ;
-		current = m.begin() ;
-		if(current == m.end())
-			current = NIL ;
-		else
-			mark.markOrbit(EDGE, current) ;
-		return current ;
-	}
-	Dart end() { return NIL ; }
-	Dart next()
-	{
-		if(current != NIL)
-		{
-			while(current != NIL && mark.isMarked(current))
-			{
-				m.next(current) ;
-				if(current == m.end())
-					current = NIL ;
-			}
-			if(current != NIL)
-				mark.markOrbit(EDGE, current) ;
-		}
-		return current ;
-	}
-} ;
-
 // Traverse the vertices incident to a given edge
 template <typename MAP>
 class Traversor2EV
@@ -379,47 +297,6 @@ public:
 					FACE CENTERED TRAVERSALS
 *******************************************************************************/
 
-// Traverse all the faces of the map
-template <typename MAP>
-class TraversorF
-{
-private:
-	MAP& m ;
-	DartMarker mark ;
-	Dart current ;
-
-public:
-	TraversorF(MAP& map, Dart dart) : m(map), mark(map)
-	{}
-
-	Dart begin()
-	{
-		mark.unmarkAll() ;
-		current = m.begin() ;
-		if(current == m.end())
-			current = NIL ;
-		else
-			mark.markOrbit(FACE, current) ;
-		return current ;
-	}
-	Dart end() { return NIL ; }
-	Dart next()
-	{
-		if(current != NIL)
-		{
-			while(current != NIL && mark.isMarked(current))
-			{
-				m.next(current) ;
-				if(current == m.end())
-					current = NIL ;
-			}
-			if(current != NIL)
-				mark.markOrbit(FACE, current) ;
-		}
-		return current ;
-	}
-} ;
-
 // Traverse the vertices incident to a given face
 template <typename MAP>
 class Traversor2FV
diff --git a/include/Topology/generic/traversorCell.h b/include/Topology/generic/traversorCell.h
new file mode 100644
index 0000000000000000000000000000000000000000..94698c6a22ba0e03138c1a5458831fbea9566bf5
--- /dev/null
+++ b/include/Topology/generic/traversorCell.h
@@ -0,0 +1,91 @@
+/*******************************************************************************
+* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps  *
+* version 0.1                                                                  *
+* Copyright (C) 2009-2011, IGG Team, LSIIT, University of Strasbourg           *
+*                                                                              *
+* This library is free software; you can redistribute it and/or modify it      *
+* under the terms of the GNU Lesser General Public License as published by the *
+* Free Software Foundation; either version 2.1 of the License, or (at your     *
+* option) any later version.                                                   *
+*                                                                              *
+* This library is distributed in the hope that it will be useful, but WITHOUT  *
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or        *
+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License  *
+* for more details.                                                            *
+*                                                                              *
+* You should have received a copy of the GNU Lesser General Public License     *
+* along with this library; if not, write to the Free Software Foundation,      *
+* Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.           *
+*                                                                              *
+* Web site: http://cgogn.u-strasbg.fr/                                         *
+* Contact information: cgogn@unistra.fr                                        *
+*                                                                              *
+*******************************************************************************/
+
+#ifndef __TRAVERSOR_CELL_H__
+#define __TRAVERSOR_CELL_H__
+
+#include "Topology/generic/dart.h"
+
+namespace CGoGN
+{
+
+template <typename MAP, unsigned int ORBIT>
+class TraversorCell
+{
+private:
+	MAP& m ;
+	DartMarker mark ;
+	Dart current ;
+
+public:
+	TraversorCell(MAP& map, Dart dart) : m(map), mark(map)
+	{}
+
+	Dart begin()
+	{
+		mark.unmarkAll() ;
+		current = m.begin() ;
+		if(current == m.end())
+			current = NIL ;
+		else
+			mark.markOrbit(ORBIT, current) ;
+		return current ;
+	}
+	Dart end() { return NIL ; }
+	Dart next()
+	{
+		if(current != NIL)
+		{
+			while(current != NIL && mark.isMarked(current))
+			{
+				m.next(current) ;
+				if(current == m.end())
+					current = NIL ;
+			}
+			if(current != NIL)
+				mark.markOrbit(ORBIT, current) ;
+		}
+		return current ;
+	}
+} ;
+
+template <typename MAP>
+class TraversorV : public TraversorCell<MAP, VERTEX>
+{};
+
+template <typename MAP>
+class TraversorE : public TraversorCell<MAP, EDGE>
+{};
+
+template <typename MAP>
+class TraversorF : public TraversorCell<MAP, FACE>
+{};
+
+template <typename MAP>
+class TraversorW : public TraversorCell<MAP, VOLUME>
+{};
+
+} // namespace CGoGN
+
+#endif