diff --git a/src/xrAICore/Navigation/builder_allocator_constructor.h b/src/xrAICore/Navigation/builder_allocator_constructor.h
index d01376e9d99..1b2712cc085 100644
--- a/src/xrAICore/Navigation/builder_allocator_constructor.h
+++ b/src/xrAICore/Navigation/builder_allocator_constructor.h
@@ -9,30 +9,28 @@
 #pragma once
 
 template <
-	typename _path_builder,
-	typename _vertex_allocator
+    template <typename _T> class _vertex,
+    typename _path_builder,
+    typename _vertex_allocator
 >
-struct CBuilderAllocatorConstructor {
-	template <template <typename _T> class _vertex> 
-	class CDataStorage : 
-        public _path_builder::template CDataStorage<_vertex>,
-        public _vertex_allocator::template CDataStorage<typename _path_builder::template CDataStorage<_vertex>::CGraphVertex>
-	{
-	public:
-        typedef typename _path_builder::template CDataStorage<_vertex>	CDataStorageBase;
-        typedef typename _vertex_allocator::template CDataStorage<
-            typename _path_builder::template CDataStorage<
-				_vertex
-			>::CGraphVertex
-		>												CDataStorageAllocator;
-		typedef typename CDataStorageBase::CGraphVertex CGraphVertex;
-		typedef typename CGraphVertex::_index_type		_index_type;
+class BuilderAllocatorDataStorage :
+    public _path_builder::template CDataStorage<_vertex>,
+    public _vertex_allocator::template CDataStorage<typename _path_builder::template CDataStorage<_vertex>::CGraphVertex>
+{
+public:
+    typedef typename _path_builder::template CDataStorage<_vertex>	CDataStorageBase;
+    typedef typename _vertex_allocator::template CDataStorage<
+        typename _path_builder::template CDataStorage<
+			_vertex
+		>::CGraphVertex
+	>												CDataStorageAllocator;
+	typedef typename CDataStorageBase::CGraphVertex CGraphVertex;
+	typedef typename CGraphVertex::_index_type		_index_type;
 
-	public:
-		IC							CDataStorage	(const u32 vertex_count);
-		virtual						~CDataStorage	();
-		IC		void				init			();
-	};
+public:
+	IC							BuilderAllocatorDataStorage(const u32 vertex_count);
+	virtual						~BuilderAllocatorDataStorage();
+	IC		void				init			();
 };
 
 #include "xrAICore/Navigation/builder_allocator_constructor_inline.h"
\ No newline at end of file
diff --git a/src/xrAICore/Navigation/builder_allocator_constructor_inline.h b/src/xrAICore/Navigation/builder_allocator_constructor_inline.h
index 2da2d11ff99..32d54cc1344 100644
--- a/src/xrAICore/Navigation/builder_allocator_constructor_inline.h
+++ b/src/xrAICore/Navigation/builder_allocator_constructor_inline.h
@@ -9,20 +9,19 @@
 #pragma once
 
 #define TEMPLATE_SPECIALIZATION \
-	template <typename _1,typename _2>\
-	template <template <typename _T> class _vertex> 
+	template <template <typename _T> class _vertex, typename _1,typename _2> 
 
-#define CConstructorBuilderAllocator CBuilderAllocatorConstructor<_1,_2>::CDataStorage<_vertex>
+#define CConstructorBuilderAllocator BuilderAllocatorDataStorage<_vertex,_1,_2>
 
 TEMPLATE_SPECIALIZATION
-IC	CConstructorBuilderAllocator::CDataStorage	(const u32 vertex_count) :
+IC	CConstructorBuilderAllocator::BuilderAllocatorDataStorage(const u32 vertex_count) :
 	CDataStorageBase			(vertex_count),
 	CDataStorageAllocator		()
 {
 }
 
 TEMPLATE_SPECIALIZATION
-CConstructorBuilderAllocator::~CDataStorage		()
+CConstructorBuilderAllocator::~BuilderAllocatorDataStorage()
 {
 }
 
diff --git a/src/xrAICore/Navigation/data_storage_constructor.h b/src/xrAICore/Navigation/data_storage_constructor.h
index 37a49e951db..a5e2968cb71 100644
--- a/src/xrAICore/Navigation/data_storage_constructor.h
+++ b/src/xrAICore/Navigation/data_storage_constructor.h
@@ -14,13 +14,13 @@ template <typename T1, typename T2> class CEmptyClassTemplate2	{};
 #include "xrAICore/Navigation/manager_builder_allocator_constructor.h"
 
 template <
-	typename _algorithm, 
-	typename _manager, 
-	typename _builder, 
-	typename _allocator,
+	typename _algorithm, // CDataStorageBucketList|CDataStorageBinaryHeap
+	typename _manager, // CVertexManagerFixed|CVertexManagerHashFixed
+	typename _builder, // CEdgePath|CVertexPath
+	typename _allocator, // CVertexAllocatorFixed
 	template <typename _T> class _vertex = CEmptyClassTemplate
 >
-struct CDataStorageConstructor : 
+struct CDataStorageConstructor : // CDataStorageBucketList::CDataStorage<CManagerBuilderAllocatorConstructor<manager, path, allocator> >
     public _algorithm::template CDataStorage<
     CManagerBuilderAllocatorConstructor<_manager, _builder, _allocator>, _vertex>
 {
diff --git a/src/xrAICore/Navigation/dijkstra.h b/src/xrAICore/Navigation/dijkstra.h
index 82c6687573a..1d764b76d92 100644
--- a/src/xrAICore/Navigation/dijkstra.h
+++ b/src/xrAICore/Navigation/dijkstra.h
@@ -48,10 +48,10 @@ template <
 
 
 	typedef CDataStorageConstructor<
-		_priority_queue,
-		_vertex_manager,
-		_data_storage_base,
-		_vertex_allocator,
+		_priority_queue, // algorithm
+		_vertex_manager, // manager
+		_data_storage_base, // builder
+		_vertex_allocator, // allocator
 		_Vertex
 	> CDataStorage;
 
diff --git a/src/xrAICore/Navigation/manager_builder_allocator_constructor.h b/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
index 08f89dba32a..2ea21af2f6b 100644
--- a/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
+++ b/src/xrAICore/Navigation/manager_builder_allocator_constructor.h
@@ -12,7 +12,7 @@
 
 template <
 	typename _manager, 
-	typename _builder,
+	typename _builder, // CVertexPath
 	typename _allocator
 >
 struct CManagerBuilderAllocatorConstructor {
@@ -22,13 +22,14 @@ struct CManagerBuilderAllocatorConstructor {
 	>
 	class CDataStorage : 
 	    public _manager::template CDataStorage<
+			_builder,
+            _allocator,
 			_vertex,
-			_index_vertex,
-			CBuilderAllocatorConstructor<_builder, _allocator>
+			_index_vertex
 		>
 	{
 	public:
-	    typedef typename _manager::template CDataStorage<_vertex, _index_vertex, CBuilderAllocatorConstructor<_builder, _allocator>> inherited;
+	    typedef typename _manager::template CDataStorage<_builder, _allocator, _vertex, _index_vertex> inherited;
 		typedef typename inherited::inherited		inherited_allocator;
 		typedef typename inherited::CGraphVertex	CGraphVertex;
 		typedef typename CGraphVertex::_index_type	_index_type;
diff --git a/src/xrAICore/Navigation/vertex_manager_fixed.h b/src/xrAICore/Navigation/vertex_manager_fixed.h
index 4316f6f1d17..dd993be37a7 100644
--- a/src/xrAICore/Navigation/vertex_manager_fixed.h
+++ b/src/xrAICore/Navigation/vertex_manager_fixed.h
@@ -36,14 +36,16 @@ struct CVertexManagerFixed {
 	};
 
 	template <
+        typename _builder,
+        typename _allocator,
 		template <typename _T> class _vertex = CEmptyClassTemplate,
-		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2,
-		typename _data_storage = CBuilderAllocatorConstructor
+		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2
 	> 
-    class CDataStorage : public _data_storage::template CDataStorage<VertexManager<_vertex>::_vertex> {
+    class CDataStorage : public BuilderAllocatorDataStorage<VertexManager<_vertex>::_vertex, _builder, _allocator>
+    {
 	public:
-        typedef typename _data_storage::template CDataStorage<
-			VertexManager<_vertex>::_vertex
+        typedef BuilderAllocatorDataStorage<
+			VertexManager<_vertex>::_vertex, _builder, _allocator
 		>												inherited;
 		typedef typename inherited::CGraphVertex		CGraphVertex;
 		typedef typename CGraphVertex::_index_type		_index_type;
diff --git a/src/xrAICore/Navigation/vertex_manager_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_fixed_inline.h
index 70bc8406a82..f2bd9dc78fc 100644
--- a/src/xrAICore/Navigation/vertex_manager_fixed_inline.h
+++ b/src/xrAICore/Navigation/vertex_manager_fixed_inline.h
@@ -15,12 +15,13 @@
 		u8 mask\
 	>\
 	template <\
+		typename _builder,\
+        typename _allocator,\
 		template <typename _T> class _vertex,\
-		template <typename _T1, typename _T2> class _index_vertex,\
-		typename _data_storage\
+		template <typename _T1, typename _T2> class _index_vertex\
 	>
 
-#define CFixedVertexManager	CVertexManagerFixed<_path_id_type,_index_type,mask>::CDataStorage<_vertex,_index_vertex,_data_storage>
+#define CFixedVertexManager	CVertexManagerFixed<_path_id_type,_index_type,mask>::CDataStorage<_builder,_allocator,_vertex,_index_vertex>
 
 TEMPLATE_SPECIALIZATION
 IC	CFixedVertexManager::CDataStorage		(const u32 vertex_count) :
diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed.h
index 87115d965ee..c498a8697ab 100644
--- a/src/xrAICore/Navigation/vertex_manager_hash_fixed.h
+++ b/src/xrAICore/Navigation/vertex_manager_hash_fixed.h
@@ -47,16 +47,16 @@ struct CVertexManagerHashFixed {
 	};
 
 	template <
+        typename _builder,
+        typename _allocator,
 		template <typename _T> class _vertex = CEmptyClassTemplate,
-		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2,
-		typename _data_storage = CBuilderAllocatorConstructor
+		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2
 	> 
-    class CDataStorage : public _data_storage::template CDataStorage<VertexManager<_vertex>::_vertex> {
+    class CDataStorage : public BuilderAllocatorDataStorage<VertexManager<_vertex>::_vertex, _builder, _allocator>
+    {
 	public:
-        typedef typename _data_storage::template CDataStorage<
-			VertexManager<
-				_vertex
-			>::_vertex
+        typedef BuilderAllocatorDataStorage<
+			VertexManager<_vertex>::_vertex, _builder, _allocator
 		>												inherited;
 		typedef typename inherited::CGraphVertex		CGraphVertex;
 		typedef typename CGraphVertex::_index_type		_index_type;
diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
index a88b4b30519..ff309048412 100644
--- a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
+++ b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
@@ -16,12 +16,13 @@
 		u32		 fix_size\
 	>\
 	template <\
+		typename _builder,\
+        typename _allocator,\
 		template <typename _T> class _vertex,\
-		template <typename _T1, typename _T2> class _index_vertex,\
-		typename _data_storage\
+		template <typename _T1, typename _T2> class _index_vertex\
 	>
 
-#define CHashFixedVertexManager	CVertexManagerHashFixed<_path_id_type,_index_type,hash_size,fix_size>::CDataStorage<_vertex,_index_vertex,_data_storage>
+#define CHashFixedVertexManager	CVertexManagerHashFixed<_path_id_type,_index_type,hash_size,fix_size>::CDataStorage<_builder,_allocator,_vertex,_index_vertex>
 
 TEMPLATE_SPECIALIZATION
 IC	CHashFixedVertexManager::CDataStorage		(const u32 vertex_count) :