diff --git a/indexer/data_factory.cpp b/indexer/data_factory.cpp
new file mode 100644
index 0000000000..1358c82f8d
--- /dev/null
+++ b/indexer/data_factory.cpp
@@ -0,0 +1,22 @@
+#include "../base/SRC_FIRST.hpp"
+
+#include "data_factory.hpp"
+#include "interval_index.hpp"
+
+#include "../defines.hpp"
+
+#include "../coding/file_reader.hpp"
+#include "../coding/file_container.hpp"
+
+#include "../base/start_mem_debug.hpp"
+
+
+void IndexFactory::Load(FilesContainerR const & cont)
+{
+  m_header.Load(cont.GetReader(HEADER_FILE_TAG));
+}
+
+IntervalIndexIFace * IndexFactory::CreateIndex(ModelReaderPtr reader)
+{
+  return new IntervalIndex<ModelReaderPtr>(reader);
+}
diff --git a/indexer/data_factory.hpp b/indexer/data_factory.hpp
new file mode 100644
index 0000000000..79e83229bf
--- /dev/null
+++ b/indexer/data_factory.hpp
@@ -0,0 +1,20 @@
+#pragma once
+#include "data_header.hpp"
+
+#include "../coding/reader.hpp"
+
+
+class FilesContainerR;
+class IntervalIndexIFace;
+
+class IndexFactory
+{
+  feature::DataHeader m_header;
+
+public:
+  void Load(FilesContainerR const & cont);
+
+  inline feature::DataHeader const & GetHeader() const { return m_header; }
+
+  IntervalIndexIFace * CreateIndex(ModelReaderPtr reader);
+};
diff --git a/indexer/data_header.cpp b/indexer/data_header.cpp
index 7ff6d0202e..c461fa1fb3 100644
--- a/indexer/data_header.cpp
+++ b/indexer/data_header.cpp
@@ -71,9 +71,4 @@ namespace feature
 
     src.Read(m_scales.data(), m_scales.size());
   }
-
-  void DataHeader::LoadForVersion(FilesContainerR const & cont)
-  {
-    Load(cont.GetReader(HEADER_FILE_TAG));
-  }
 }
diff --git a/indexer/data_header.hpp b/indexer/data_header.hpp
index 83fe37e7a5..434747a1ef 100644
--- a/indexer/data_header.hpp
+++ b/indexer/data_header.hpp
@@ -9,7 +9,6 @@
 
 class ModelReaderPtr;
 class FileWriter;
-class FilesContainerR;
 
 namespace feature
 {
@@ -41,8 +40,6 @@ namespace feature
     //@{
     void Save(FileWriter & w) const;
     void Load(ModelReaderPtr const & r);
-
-    void LoadForVersion(FilesContainerR const & cont);
     //@}
   };
 }
diff --git a/indexer/index.hpp b/indexer/index.hpp
index 642cf5a08f..ff91666b1d 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "cell_id.hpp"
 #include "covering.hpp"
-#include "data_header.hpp"
+#include "data_factory.hpp"
 #include "features_vector.hpp"
 #include "scale_index.hpp"
 #include "scales.hpp"
@@ -267,10 +267,11 @@ private:
       : m_action(INDEX_DO_NOTHING), m_file(file), m_lockCount(0),
         m_queriesSkipped(0)
     {
-      m_header.LoadForVersion(FilesContainerR(GetPlatform().GetReader(m_file)));
+      m_factory.Load(FilesContainerR(GetPlatform().GetReader(m_file)));
 
-      m_rect = m_header.GetBounds();
-      m_scaleRange = m_header.GetScaleRange();
+      feature::DataHeader const & h = m_factory.GetHeader();
+      m_rect = h.GetBounds();
+      m_scaleRange = h.GetScaleRange();
     }
 
     IndexT * Lock(int scale, m2::RectD const & occlusionRect)
@@ -321,7 +322,8 @@ private:
 
     search::SearchInfo * GetSearchInfo() const
     {
-      return new search::SearchInfo(FilesContainerR(GetPlatform().GetReader(m_file)), m_header);
+      return new search::SearchInfo(FilesContainerR(GetPlatform().GetReader(m_file)),
+                                    m_factory.GetHeader());
     }
 
     void CloseIfUnlocked()
@@ -356,7 +358,7 @@ private:
     {
       if (p == 0)
       {
-        p = new IndexT(FilesContainerR(GetPlatform().GetReader(m_file)), m_header);
+        p = new IndexT(FilesContainerR(GetPlatform().GetReader(m_file)), m_factory);
       }
     }
 
@@ -382,7 +384,7 @@ private:
 
     string m_file;
 
-    feature::DataHeader m_header;
+    IndexFactory m_factory;
     m2::RectD m_rect;
     pair<int, int> m_scaleRange;
 
@@ -425,8 +427,9 @@ template <class FeatureVectorT, class BaseT> class OffsetToFeatureAdapter : publ
 public:
   typedef typename BaseT::Query Query;
 
-  OffsetToFeatureAdapter(FilesContainerR const & cont, feature::DataHeader const & header)
-  : BaseT(cont.GetReader(INDEX_FILE_TAG)), m_FeatureVector(cont, header)
+  OffsetToFeatureAdapter(FilesContainerR const & cont, IndexFactory & factory)
+  : BaseT(cont.GetReader(INDEX_FILE_TAG), factory),
+    m_FeatureVector(cont, factory.GetHeader())
   {
   }
 
@@ -438,11 +441,6 @@ public:
     BaseT::ForEachInIntervalAndScale(offsetToFeatureReplacer, beg, end, scale, query);
   }
 
-  //bool IsMyData(string const & fName) const
-  //{
-  //  return m_FeatureVector.IsMyData(fName);
-  //}
-
 private:
   FeatureVectorT m_FeatureVector;
 
@@ -488,7 +486,7 @@ public:
   explicit UniqueOffsetAdapter(T1 const & t1) : BaseT(t1) {}
 
   template <typename T1, typename T2>
-  UniqueOffsetAdapter(T1 const & t1, T2 const & t2) : BaseT(t1, t2) {}
+  UniqueOffsetAdapter(T1 const & t1, T2 & t2) : BaseT(t1, t2) {}
 
   template <typename F>
   void ForEachInIntervalAndScale(F const & f, int64_t beg, int64_t end, uint32_t scale,
diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index b3398fe921..ec1dd9ab10 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -32,6 +32,7 @@ SOURCES += \
     feature_rect.cpp \
     types_mapping.cpp \
     search_index_builder.cpp \
+    data_factory.cpp \
     coding_params.cpp \
     feature_loader_base.cpp \
     feature_loader.cpp \
@@ -71,6 +72,8 @@ HEADERS += \
     feature_rect.hpp \
     types_mapping.hpp \
     search_index_builder.hpp \
+    interval_index_iface.hpp \
+    data_factory.hpp \
     coding_params.hpp \
     feature_loader_base.hpp \
     feature_loader.hpp \
diff --git a/indexer/interval_index.hpp b/indexer/interval_index.hpp
index fa62a0700d..312cb095a4 100644
--- a/indexer/interval_index.hpp
+++ b/indexer/interval_index.hpp
@@ -1,18 +1,23 @@
 #pragma once
+#include "interval_index_iface.hpp"
+
 #include "../coding/endianness.hpp"
 #include "../coding/byte_stream.hpp"
 #include "../coding/reader.hpp"
 #include "../coding/varint.hpp"
+
 #include "../base/assert.hpp"
 #include "../base/base.hpp"
 #include "../base/bits.hpp"
 #include "../base/buffer_vector.hpp"
 #include "../base/macros.hpp"
+
 #include "../std/algorithm.hpp"
 #include "../std/memcpy.hpp"
 #include "../std/static_assert.hpp"
 
-class IntervalIndexBase
+
+class IntervalIndexBase : public IntervalIndexIFace
 {
 public:
 #pragma pack(push, 1)
@@ -38,9 +43,9 @@ public:
 template <class ReaderT>
 class IntervalIndex : public IntervalIndexBase
 {
+  typedef IntervalIndexBase base_t;
 public:
-
-  class Query
+  class Query : public base_t::QueryIFace
   {
   public:
     void Clear() {}
@@ -83,6 +88,11 @@ public:
     ForEach(f, beg, end, query);
   }
 
+  virtual void DoForEach(FunctionT const & f, uint64_t beg, uint64_t end, QueryIFace & /*query*/)
+  {
+    ForEach(f, beg, end);
+  }
+
 private:
 
   template <typename F>
diff --git a/indexer/interval_index_iface.hpp b/indexer/interval_index_iface.hpp
new file mode 100644
index 0000000000..879ee59eb9
--- /dev/null
+++ b/indexer/interval_index_iface.hpp
@@ -0,0 +1,19 @@
+#pragma once
+#include "../std/function.hpp"
+
+
+class IntervalIndexIFace
+{
+public:
+  virtual ~IntervalIndexIFace() {}
+
+  class QueryIFace
+  {
+  public:
+    virtual ~QueryIFace() {}
+  };
+
+  typedef function<void (uint32_t)> FunctionT;
+
+  virtual void DoForEach(FunctionT const & f, uint64_t beg, uint64_t end, QueryIFace & query) = 0;
+};
diff --git a/indexer/scale_index.hpp b/indexer/scale_index.hpp
index b51c844836..ecbc4f0df5 100644
--- a/indexer/scale_index.hpp
+++ b/indexer/scale_index.hpp
@@ -1,11 +1,18 @@
 #pragma once
 
-#include "interval_index.hpp"
+#include "data_factory.hpp"
+#include "interval_index_iface.hpp"
+
 #include "../coding/var_serial_vector.hpp"
+
 #include "../base/assert.hpp"
 #include "../base/base.hpp"
 #include "../base/macros.hpp"
+#include "../base/stl_add.hpp"
+
 #include "../std/algorithm.hpp"
+#include "../std/bind.hpp"
+
 
 class ScaleIndexBase
 {
@@ -55,20 +62,32 @@ class ScaleIndex : public ScaleIndexBase
 {
 public:
   typedef ReaderT ReaderType;
-  typedef IntervalIndex<ReaderT> IntervalIndexType;
-  typedef typename IntervalIndexType::Query Query;
+  typedef typename IntervalIndexIFace::QueryIFace Query;
 
   ScaleIndex() {}
-  explicit ScaleIndex(ReaderT const & reader) { Attach(reader); }
-
-  void Attach(ReaderT const & reader)
+  explicit ScaleIndex(ReaderT const & reader, IndexFactory & factory)
   {
+    Attach(reader, factory);
+  }
+  ~ScaleIndex()
+  {
+    Clear();
+  }
+
+  void Clear()
+  {
+    for_each(m_IndexForScale.begin(), m_IndexForScale.end(), DeleteFunctor());
     m_IndexForScale.clear();
+  }
+
+  void Attach(ReaderT const & reader, IndexFactory & factory)
+  {
+    Clear();
 
     ReaderSource<ReaderT> source(reader);
     VarSerialVectorReader<ReaderT> treesReader(source);
     for (size_t i = 0; i < treesReader.Size(); ++i)
-      m_IndexForScale.push_back(IntervalIndexType(treesReader.SubReader(i)));
+      m_IndexForScale.push_back(factory.CreateIndex(treesReader.SubReader(i)));
   }
 
   template <typename F>
@@ -78,9 +97,9 @@ public:
     size_t const scaleBucket = BucketByScale(scale);
     if (scaleBucket < m_IndexForScale.size())
       for (size_t i = 0; i <= scaleBucket; ++i)
-        m_IndexForScale[i].ForEach(f, beg, end, query);
+        m_IndexForScale[i]->DoForEach(bind<void>(ref(f), _1), beg, end, query);
   }
 
 private:
-  vector<IntervalIndexType> m_IndexForScale;
+  vector<IntervalIndexIFace *> m_IndexForScale;
 };