diff --git a/indexer/data_header_reader.cpp b/indexer/data_header_reader.cpp
index be77ac65bc..3463709b86 100644
--- a/indexer/data_header_reader.cpp
+++ b/indexer/data_header_reader.cpp
@@ -1,8 +1,11 @@
+#include "../base/SRC_FIRST.hpp"
+
 #include "data_header_reader.hpp"
 #include "data_header.hpp"
 
-#include "../coding/file_reader.hpp"
-#include "../coding/file_writer.hpp"
+#include "../storage/defines.hpp"
+
+#include "../coding/file_container.hpp"
 
 #include "../base/start_mem_debug.hpp"
 
@@ -18,7 +21,7 @@ namespace feature
   {
     try
     {
-      FileReader reader(datFileName);
+      FileReader reader = FilesContainerR(datFileName).GetReader(DATA_FILE_TAG);
 
       uint64_t const toSkip = GetSkipHeaderSize(reader);
 
@@ -50,5 +53,4 @@ namespace feature
     if (sz > 0)
       writer.Write(&buffer[0], buffer.size());
   }
-
 }
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 951151b25b..407a3e0c1e 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -234,8 +234,7 @@ public:
     vector<char> m_data;
     uint32_t m_offset;
 
-    read_source_t() : m_offset(0) {}
-    read_source_t(string const &) : m_offset(0) {}
+    read_source_t(...) : m_offset(0) {}
 
     void assign(char const * data, uint32_t size)
     {
@@ -341,8 +340,8 @@ public:
     FileReader m_gF;
     FileReader m_trgF;
 
-    read_source_t(string const & name)
-      : m_gF(name + GEOMETRY_FILE_EXTENSION), m_trgF(name + TRIANGLES_FILE_EXTENSION)
+    read_source_t(FileReader const & gF, FileReader const & trgF)
+      : m_gF(gF), m_trgF(trgF)
     {
     }
   };
diff --git a/indexer/feature_processor.hpp b/indexer/feature_processor.hpp
index 1045f6593a..b71e56f4b7 100644
--- a/indexer/feature_processor.hpp
+++ b/indexer/feature_processor.hpp
@@ -1,18 +1,25 @@
 #pragma once
 
-#include "feature.hpp"
-#include "data_header_reader.hpp"
+#include "features_vector.hpp"
 
-#include "../coding/varint.hpp"
-#include "../coding/file_reader.hpp"
+#include "../coding/file_container.hpp"
+
+#include "../std/bind.hpp"
 
-#include "../std/vector.hpp"
 
 namespace feature
 {
-  /// Read feature from feature source.
-  template <class TSource, class TFeature>
-  void ReadFromSource(TSource & src, TFeature & f, typename TFeature::read_source_t & buffer)
+  template <class ToDo>
+  void ForEachFromDat(string const & fName, ToDo & toDo)
+  {
+    FilesContainerR container(fName);
+    FeaturesVector<FileReader> featureSource(container);
+    featureSource.ForEachOffset(bind<void>(ref(toDo), _1, _2));
+  }
+
+   /// Read feature from feature source.
+  template <class TSource>
+  void ReadFromSource(TSource & src, FeatureGeom & f, typename FeatureGeom::read_source_t & buffer)
   {
     uint32_t const sz = ReadVarUint<uint32_t>(src);
     buffer.m_data.resize(sz);
@@ -21,14 +28,14 @@ namespace feature
   }
 
   /// Process features in .dat file.
-  template <class TFeature, class ToDo>
-  void ForEachFromDat(string const & fName, ToDo & toDo)
+  template <class ToDo>
+  void ForEachFromDatRawFormat(string const & fName, ToDo & toDo)
   {
     typedef ReaderSource<FileReader> source_t;
 
     FileReader reader(fName);
     source_t src(reader);
-    typename TFeature::read_source_t buffer(fName);
+    typename FeatureGeom::read_source_t buffer(fName);
 
     // skip header
     uint64_t currPos = feature::GetSkipHeaderSize(reader);
@@ -38,7 +45,7 @@ namespace feature
     // read features one by one
     while (currPos < fSize)
     {
-      TFeature f;
+      FeatureGeom f;
       ReadFromSource(src, f, buffer);
       toDo(f, currPos);
       currPos = src.Pos();
diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp
index 0721366a03..d1612b5fa6 100644
--- a/indexer/features_vector.hpp
+++ b/indexer/features_vector.hpp
@@ -1,21 +1,40 @@
 #pragma once
-#include "../indexer/feature.hpp"
+#include "feature.hpp"
+#include "data_header_reader.hpp"
+
+#include "../storage/defines.hpp"
 
 #include "../coding/var_record_reader.hpp"
 
 #include "../base/base.hpp"
 
-#include "../std/bind.hpp"
+//#include "../std/bind.hpp"
 
 
+template <class ReaderT>
+struct FeatureReaders
+{
+  ReaderT m_datR, m_geomR, m_trgR;
+
+  template <class ContainerT>
+  FeatureReaders(ContainerT const & cont)
+    : m_datR(cont.GetReader(DATA_FILE_TAG)),
+      m_geomR(cont.GetReader(GEOMETRY_FILE_TAG)),
+      m_trgR(cont.GetReader(TRIANGLE_FILE_TAG))
+  {
+    uint64_t const offset = feature::GetSkipHeaderSize(m_datR);
+    m_datR = m_datR.SubReader(offset, m_datR.Size() - offset);
+  }
+};
+
 template <typename ReaderT>
 class FeaturesVector
 {
 public:
   typedef ReaderT ReaderType;
 
-  explicit FeaturesVector(ReaderT const & reader)
-    : m_RecordReader(reader, 256), m_source(reader.GetName())
+  FeaturesVector(FeatureReaders<ReaderT> const & dataR)
+    : m_RecordReader(dataR.m_datR, 256), m_source(dataR.m_geomR, dataR.m_trgR)
   {
   }
 
@@ -25,19 +44,17 @@ public:
     feature.Deserialize(m_source);
   }
 
-  template <class TDo> void ForEachOffset(TDo const & toDo) const
+  template <class ToDo> void ForEachOffset(ToDo toDo) const
   {
-    FeatureType f;
-    m_RecordReader.ForEachRecord(
-        bind<void>(toDo, bind(&FeaturesVector<ReaderT>::DeserializeFeature, this, _2, _3, &f), _1));
+    m_RecordReader.ForEachRecord(feature_getter<ToDo>(toDo, m_source));
   }
 
-  template <class TDo> void ForEach(TDo const & toDo) const
-  {
-    FeatureType f;
-    m_RecordReader.ForEachRecord(
-        bind<void>(toDo, bind(&FeaturesVector<ReaderT>::DeserializeFeature, this, _2, _3, &f)));
-  }
+  //template <class TDo> void ForEach(TDo const & toDo) const
+  //{
+  //  FeatureType f;
+  //  m_RecordReader.ForEachRecord(
+  //      bind<void>(toDo, bind(&FeaturesVector<ReaderT>::DeserializeFeature, this, _2, _3, &f)));
+  //}
 
   bool IsMyData(string const & fName) const
   {
@@ -45,12 +62,24 @@ public:
   }
 
 private:
-  FeatureType const & DeserializeFeature(char const * data, uint32_t size, FeatureType * pFeature) const
+  template <class ToDo> class feature_getter
   {
-    m_source.assign(data, size);
-    pFeature->Deserialize(m_source);
-    return *pFeature;
-  }
+    ToDo & m_toDo;
+    FeatureType::read_source_t & m_source;
+
+  public:
+    feature_getter(ToDo & toDo, FeatureType::read_source_t & src)
+      : m_toDo(toDo), m_source(src)
+    {
+    }
+    void operator() (uint32_t pos, char const * data, uint32_t size) const
+    {
+      FeatureType f;
+      m_source.assign(data, size);
+      f.Deserialize(m_source);
+      m_toDo(f, pos);
+    }
+  };
 
   VarRecordReader<ReaderT, &VarRecordSizeReaderVarint> m_RecordReader;
   mutable FeatureType::read_source_t m_source;
diff --git a/indexer/index.hpp b/indexer/index.hpp
index 2b8f8d6ed3..160a31aa45 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -82,10 +82,10 @@ public:
       m_Indexes[i]->ForEachInIntervalAndScale(f, beg, end, scale, query);
   }
 
-  template <class DataReaderT, class IndexReaderT>
-  void Add(DataReaderT const & dataReader, IndexReaderT const & indexReader)
+  template <class DatReaderT, class IndexReaderT>
+  void Add(FeatureReaders<DatReaderT> const & dataR, IndexReaderT const & indexR)
   {
-    m_Indexes.push_back(new IndexT(dataReader, indexReader));
+    m_Indexes.push_back(new IndexT(dataR, indexR));
   }
 
   bool IsExist(string const & dataPath) const
@@ -123,9 +123,9 @@ template <class FeatureVectorT, class BaseT> class OffsetToFeatureAdapter : publ
 public:
   typedef typename BaseT::Query Query;
 
-  OffsetToFeatureAdapter(typename FeatureVectorT::ReaderType const & dataReader,
-                         typename BaseT::ReaderType const & indexReader)
-                           : BaseT(indexReader), m_FeatureVector(dataReader)
+  OffsetToFeatureAdapter( FeatureReaders<typename FeatureVectorT::ReaderType> const & dataR,
+                          typename BaseT::ReaderType const & indexR)
+  : BaseT(indexR), m_FeatureVector(dataR)
   {
   }
 
diff --git a/indexer/index_builder.cpp b/indexer/index_builder.cpp
index bddebd6d67..35579c1418 100644
--- a/indexer/index_builder.cpp
+++ b/indexer/index_builder.cpp
@@ -2,25 +2,24 @@
 #include "data_header_reader.hpp"
 #include "features_vector.hpp"
 
-#include "../coding/file_reader.hpp"
+#include "../storage/defines.hpp"
+
+#include "../coding/file_container.hpp"
 
 
 namespace indexer
 {
-  bool BuildIndexFromDatFile(string const & fullIndexFilePath, string const & fullDatFilePath,
-                             string const & tmpFilePath)
+  bool BuildIndexFromDatFile(string const & datFile, string const & tmpFile)
   {
     try
     {
-      FileReader dataReader(fullDatFilePath);
+      FilesContainerR readCont(datFile);
+      FeaturesVector<FileReader> featuresVector(readCont);
 
-      uint64_t startOffset = feature::GetSkipHeaderSize(dataReader);
-
-      FileReader subReader = dataReader.SubReader(startOffset, dataReader.Size() - startOffset);
-      FeaturesVector<FileReader> featuresVector(subReader);
-
-      FileWriter indexWriter(fullIndexFilePath.c_str());
-      BuildIndex(featuresVector, indexWriter, tmpFilePath);
+      FilesContainerW writeCont(datFile, FileWriter::OP_APPEND);
+      FileWriter writer = writeCont.GetWriter(INDEX_FILE_TAG);
+      BuildIndex(featuresVector, writer, tmpFile);
+      writeCont.Finish();
     }
     catch (Reader::OpenException const & e)
     {
diff --git a/indexer/index_builder.hpp b/indexer/index_builder.hpp
index b31353136a..864e96cd0c 100644
--- a/indexer/index_builder.hpp
+++ b/indexer/index_builder.hpp
@@ -22,7 +22,5 @@ namespace indexer
   }
 
   // doesn't throw exceptions
-  bool BuildIndexFromDatFile(string const & fullIndexFilePath,
-                             string const & fullDatFilePath,
-                             string const & tmpFilePath);
+  bool BuildIndexFromDatFile(string const & datFile, string const & tmpFile);
 }
diff --git a/indexer/indexer_tests/feature_routine.cpp b/indexer/indexer_tests/feature_routine.cpp
index 6f83e2361c..7b93d2fea1 100644
--- a/indexer/indexer_tests/feature_routine.cpp
+++ b/indexer/indexer_tests/feature_routine.cpp
@@ -23,7 +23,7 @@ void FeatureBuilder2Feature(FeatureBuilderGeomRef const & fb, FeatureGeomRef & f
   WriteToFile(datFile + ".geom", buffers.m_buffers[1]);
   WriteToFile(datFile + ".trg", buffers.m_buffers[2]);
 
-  static FeatureGeomRef::read_source_t g_source(datFile);
+  static FeatureGeomRef::read_source_t g_source(FileReader(datFile + ".geom"), FileReader(datFile + ".trg"));
   g_source.m_data.swap(buffers.m_buffers[0]);
   f.Deserialize(g_source);
 }
diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp
index 772bde5040..a6fa3f4827 100644
--- a/indexer/indexer_tests/index_builder_test.cpp
+++ b/indexer/indexer_tests/index_builder_test.cpp
@@ -6,6 +6,8 @@
 #include "../features_vector.hpp"
 #include "../data_header_reader.hpp"
 
+#include "../../coding/file_container.hpp"
+
 #include "../../platform/platform.hpp"
 
 
@@ -16,11 +18,9 @@ UNIT_TEST(BuildIndexTest)
                       p.ReadPathForFile("classificator.txt"),
                       p.ReadPathForFile("visibility.txt"));
 
-  FileReader reader(p.WritablePathForFile("minsk-pass.dat"));
-  // skip xml metadata header
-  uint64_t const startOffset = feature::GetSkipHeaderSize(reader);
-  FileReader subReader = reader.SubReader(startOffset, reader.Size() - startOffset);
-  FeaturesVector<FileReader> featuresVector(subReader);
+  FilesContainerR container(p.WritablePathForFile("minsk-pass" DATA_FILE_EXTENSION));
+
+  FeaturesVector<FileReader> featuresVector(container);
 
   string serial;
   {
@@ -30,5 +30,5 @@ UNIT_TEST(BuildIndexTest)
 
   MemReader indexReader(&serial[0], serial.size());
   Index<FileReader, MemReader>::Type index;
-  index.Add(reader, indexReader);
+  index.Add(FeatureReaders<FileReader>(container), indexReader);
 }
diff --git a/indexer/indexer_tests/index_test.cpp b/indexer/indexer_tests/index_test.cpp
index f54d25baaa..fb9f18b5c5 100644
--- a/indexer/indexer_tests/index_test.cpp
+++ b/indexer/indexer_tests/index_test.cpp
@@ -4,17 +4,18 @@
 #include "../index_builder.hpp"
 
 #include "../../testing/testing.hpp"
-#include "../../coding/file_reader.hpp"
-#include "../../coding/writer.hpp"
+
+#include "../../coding/file_container.hpp"
+
 #include "../../platform/platform.hpp"
 
 #include "../../std/string.hpp"
 
+
 UNIT_TEST(IndexParseTest)
 {
-  FileReader dataReader(GetPlatform().WritablePathForFile("minsk-pass.dat"));
-  FileReader indexReader(GetPlatform().WritablePathForFile("minsk-pass.dat.idx"));
+  FilesContainerR container(GetPlatform().WritablePathForFile("minsk-pass" DATA_FILE_EXTENSION));
 
   Index<FileReader, FileReader>::Type index;
-  index.Add(dataReader, indexReader);
+  index.Add(FeatureReaders<FileReader>(container), container.GetReader(INDEX_FILE_TAG));
 }
diff --git a/indexer/indexer_tool/feature_generator.cpp b/indexer/indexer_tool/feature_generator.cpp
index ff26d4246f..5e39fcd5b9 100644
--- a/indexer/indexer_tool/feature_generator.cpp
+++ b/indexer/indexer_tool/feature_generator.cpp
@@ -142,16 +142,14 @@ void FeaturesCollector::Init()
 }
 
 FeaturesCollector::FeaturesCollector(string const & fName)
-: m_datFile(fName), m_geoFile(fName + GEOMETRY_FILE_EXTENSION), m_trgFile(fName + TRIANGLES_FILE_EXTENSION)
+: m_datFile(fName)
 {
   Init();
 }
 
 FeaturesCollector::FeaturesCollector(string const & bucket,
                                      FeaturesCollector::InitDataType const & prefix)
-: m_datFile(prefix.first + bucket + prefix.second),
-  m_geoFile(prefix.first + bucket + prefix.second + GEOMETRY_FILE_EXTENSION),
-  m_trgFile(prefix.first + bucket + prefix.second + TRIANGLES_FILE_EXTENSION)
+: m_datFile(prefix.first + bucket + prefix.second)
 {
   Init();
 }
@@ -193,7 +191,33 @@ void FeaturesCollector::operator() (FeatureBuilderGeom const & fb)
   WriteFeatureBase(bytes, fb);
 }
 
-void FeaturesCollector::operator() (FeatureBuilderGeomRef const & fb)
+void FeaturesCollector::WriteHeader()
+{
+  // rewrite map information with actual data
+  m_datFile.Seek(0);
+  feature::DataHeader header;
+  header.SetBounds(m_bounds);
+  WriteDataHeader(m_datFile, header);
+}
+
+FeaturesCollector::~FeaturesCollector()
+{
+  WriteHeader();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// FeaturesCollectorRef implementation
+/////////////////////////////////////////////////////////////////////////////////////////
+
+FeaturesCollectorRef::FeaturesCollectorRef(string const & fName)
+: FeaturesCollector(fName + DATA_FILE_TAG),
+  m_writer(fName),
+  m_geoFile(fName + GEOMETRY_FILE_TAG),
+  m_trgFile(fName + TRIANGLE_FILE_TAG)
+{
+}
+
+void FeaturesCollectorRef::operator() (FeatureBuilderGeomRef const & fb)
 {
   FilePreCondition(m_datFile);
   FilePreCondition(m_geoFile);
@@ -210,13 +234,20 @@ void FeaturesCollector::operator() (FeatureBuilderGeomRef const & fb)
   WriteBuffer(m_trgFile, buffers.m_buffers[2]);
 }
 
-FeaturesCollector::~FeaturesCollector()
+FeaturesCollectorRef::~FeaturesCollectorRef()
 {
-  // rewrite map information with actual data
-  m_datFile.Seek(0);
-  feature::DataHeader header;
-  header.SetBounds(m_bounds);
-  WriteDataHeader(m_datFile, header);
+  WriteHeader();
+
+  // assume like we close files
+  m_datFile.Flush();
+  m_geoFile.Flush();
+  m_trgFile.Flush();
+
+  // make one file container
+  m_writer.Append(m_datFile.GetName(), DATA_FILE_TAG);
+  m_writer.Append(m_geoFile.GetName(), GEOMETRY_FILE_TAG);
+  m_writer.Append(m_trgFile.GetName(), TRIANGLE_FILE_TAG);
+  m_writer.Finish();
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/indexer/indexer_tool/feature_generator.hpp b/indexer/indexer_tool/feature_generator.hpp
index bf68796394..a5d770bd8b 100644
--- a/indexer/indexer_tool/feature_generator.hpp
+++ b/indexer/indexer_tool/feature_generator.hpp
@@ -4,7 +4,7 @@
 
 #include "../../geometry/rect2d.hpp"
 
-#include "../../coding/file_writer.hpp"
+#include "../../coding/file_container.hpp"
 
 #include "../../std/vector.hpp"
 #include "../../std/string.hpp"
@@ -32,25 +32,40 @@ namespace feature
   // Writes features to dat file.
   class FeaturesCollector
   {
-    FileWriter m_datFile, m_geoFile, m_trgFile;
+  protected:
+    FileWriter m_datFile;
+
     m2::RectD m_bounds;
 
+  protected:
     void Init();
     void FilePreCondition(FileWriter const & f);
 
+    void WriteHeader();
+
     static void WriteBuffer(FileWriter & f, vector<char> const & bytes);
     void WriteFeatureBase(vector<char> const & bytes, FeatureBuilderGeom const & fb);
 
   public:
-    ~FeaturesCollector();
-
     // Stores prefix and suffix of a dat file name.
     typedef pair<string, string> InitDataType;
 
-    explicit FeaturesCollector(string const & fName);
+    FeaturesCollector(string const & fName);
     FeaturesCollector(string const & bucket, InitDataType const & prefix);
+    ~FeaturesCollector();
 
     void operator() (FeatureBuilderGeom const & f);
+  };
+
+  class FeaturesCollectorRef : public FeaturesCollector
+  {
+    FilesContainerW m_writer;
+    FileWriter m_geoFile, m_trgFile;
+
+  public:
+    explicit FeaturesCollectorRef(string const & fName);
+    ~FeaturesCollectorRef();
+
     void operator() (FeatureBuilderGeomRef const & f);
   };
 }
diff --git a/indexer/indexer_tool/feature_sorter.cpp b/indexer/indexer_tool/feature_sorter.cpp
index db068ec262..16c9227e90 100644
--- a/indexer/indexer_tool/feature_sorter.cpp
+++ b/indexer/indexer_tool/feature_sorter.cpp
@@ -78,21 +78,16 @@ namespace feature
 
     // stores cellIds for middle points
     CalculateMidPoints midPoints;
-    ForEachFromDat<FeatureGeom>(tempDatFilePath, midPoints);
+    ForEachFromDatRawFormat(tempDatFilePath, midPoints);
 
     // sort features by their middle point
     std::sort(midPoints.m_vec.begin(), midPoints.m_vec.end(), &SortMidPointsFunc);
 
     // store sorted features
     {
-      //FileWriter writer(datFilePath);
       FileReader reader(tempDatFilePath);
 
-      //feature::DataHeader header;
-      //feature::ReadDataHeader(tempDatFilePath, header);
-      //feature::WriteDataHeader(writer, header);
-
-      FeaturesCollector collector(datFilePath);
+      FeaturesCollectorRef collector(datFilePath);
 
       for (size_t i = 0; i < midPoints.m_vec.size(); ++i)
       {
@@ -107,16 +102,14 @@ namespace feature
         buffer.m_data.resize(sz);
         src.Read(&buffer.m_data[0], sz);
 
+        // FeatureGeom -> FeatureBuilderTypes
         FeatureGeom f;
         f.Deserialize(buffer);
 
         FeatureBuilderType fb;
         f.InitFeatureBuilder(fb);
 
-        // write feature bytes
-        //WriteVarUint(writer, sz);
-        //writer.Write(&buffer[0], sz);
-
+        // emit the feature
         collector(fb);
       }
 
@@ -125,6 +118,12 @@ namespace feature
 
     // remove old not-sorted dat file
     if (removeOriginalFile)
+    {
       FileWriter::DeleteFile(tempDatFilePath);
+
+      FileWriter::DeleteFile(datFilePath + DATA_FILE_TAG);
+      FileWriter::DeleteFile(datFilePath + GEOMETRY_FILE_TAG);
+      FileWriter::DeleteFile(datFilePath + TRIANGLE_FILE_TAG);
+    }
   }
 } // namespace feature
diff --git a/indexer/indexer_tool/indexer_tool.cpp b/indexer/indexer_tool/indexer_tool.cpp
index c5bd4c2518..7b98ec19d1 100644
--- a/indexer/indexer_tool/indexer_tool.cpp
+++ b/indexer/indexer_tool/indexer_tool.cpp
@@ -144,8 +144,7 @@ int main(int argc, char ** argv)
     if (FLAGS_generate_index)
     {
       LOG(LINFO, ("Generating index for", datFile));
-      if (!indexer::BuildIndexFromDatFile(datFile + INDEX_FILE_EXTENSION, datFile,
-                                          FLAGS_intermediate_data_path + FLAGS_output))
+      if (!indexer::BuildIndexFromDatFile(datFile, FLAGS_intermediate_data_path + FLAGS_output))
       {
         LOG(LCRITICAL, ("Error generating index."));
       }
diff --git a/indexer/interval_index_builder.hpp b/indexer/interval_index_builder.hpp
index 0d75b59818..08dc1e870f 100644
--- a/indexer/interval_index_builder.hpp
+++ b/indexer/interval_index_builder.hpp
@@ -21,7 +21,7 @@ void BuildIntervalIndex(CellIdValueIterT const & beg, CellIdValueIterT const & e
     uint32_t maxCount = 0;
     typename CellIdValueIterT::value_type mostPopulousCell = *beg;
     CellIdValueIterT it = beg;
-    int64_t prev = it->GetCell();
+    uint64_t prev = it->GetCell();
     for (++it; it != end; ++it)
     {
       ASSERT_GREATER(it->GetCell(), 0, ());
diff --git a/map/feature_vec_model.cpp b/map/feature_vec_model.cpp
index f085d2f9c3..4034504494 100644
--- a/map/feature_vec_model.cpp
+++ b/map/feature_vec_model.cpp
@@ -8,7 +8,8 @@
 #include "../indexer/scales.hpp"
 #include "../indexer/classif_routine.hpp"
 #include "../indexer/classificator.hpp"
-#include "../indexer/data_header_reader.hpp"
+
+#include "../coding/file_container.hpp"
 
 #include "../base/logging.hpp"
 
@@ -27,31 +28,18 @@ void FeaturesFetcher::InitClassificator()
                       p.ReadPathForFile("visibility.txt"));
 }
 
-void FeaturesFetcher::AddMap(string const & dataPath, string const & indexPath)
+void FeaturesFetcher::AddMap(string const & fName)
 {
-  if (m_multiIndex.IsExist(dataPath))
+  if (m_multiIndex.IsExist(fName))
     return;
 
   try
   {
-    uint32_t const datLogPageSize = 10;
-    uint32_t const datLogPageCount = 11;
+    uint32_t const logPageSize = 12;
+    uint32_t const logPageCount = 12;
 
-    uint32_t const idxLogPageSize = 8;
-    uint32_t const idxLogPageCount = 11;
-
-    FileReader dataReader(dataPath, datLogPageSize, datLogPageCount);
-    uint64_t const startOffset = feature::GetSkipHeaderSize(dataReader);
-
-#ifdef USE_BUFFER_READER
-    // readers from memory
-    m_multiIndex.Add(BufferReader(dataReader, startOffset), BufferReader(FileReader(indexPath)));
-#else
-    // readers from file
-    m_multiIndex.Add(
-        dataReader.SubReader(startOffset, dataReader.Size() - startOffset),
-        FileReader(indexPath, idxLogPageSize, idxLogPageCount));
-#endif
+    FilesContainerR container(fName, logPageSize, logPageCount);
+    m_multiIndex.Add(FeatureReaders<FileReader>(container), container.GetReader(INDEX_FILE_TAG));
   }
   catch (Reader::OpenException const & e)
   {
@@ -63,9 +51,9 @@ void FeaturesFetcher::AddMap(string const & dataPath, string const & indexPath)
   }
 }
 
-void FeaturesFetcher::RemoveMap(string const & dataPath)
+void FeaturesFetcher::RemoveMap(string const & fName)
 {
-  m_multiIndex.Remove(dataPath);
+  m_multiIndex.Remove(fName);
 }
 
 void FeaturesFetcher::Clean()
diff --git a/map/feature_vec_model.hpp b/map/feature_vec_model.hpp
index 55b6dfa247..56e3432fb5 100644
--- a/map/feature_vec_model.hpp
+++ b/map/feature_vec_model.hpp
@@ -49,8 +49,8 @@ namespace model
   public:
     void InitClassificator();
 
-    void AddMap(string const & dataPath, string const & indexPath);
-    void RemoveMap(string const & dataPath);
+    void AddMap(string const & fName);
+    void RemoveMap(string const & fName);
     void Clean();
 
     // process features by param type indices
diff --git a/map/framework.hpp b/map/framework.hpp
index 5c08d608ee..2da94da193 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -135,7 +135,7 @@ class FrameWork
 
   threads::Mutex m_modelSyn;
 
-  void AddMap(string const & datFile, string const & idxFile)
+  void AddMap(string const & datFile)
   {
     // update rect for Show All button
     feature::DataHeader header;
@@ -144,7 +144,7 @@ class FrameWork
       m_model.AddWorldRect(header.Bounds());
       {
         threads::MutexGuard lock(m_modelSyn);
-        m_model.AddMap(datFile, idxFile);
+        m_model.AddMap(datFile);
       }
     }
     else
@@ -183,7 +183,7 @@ public:
     m_model.InitClassificator();
 
     // initializes model with locally downloaded maps
-    storage.Init( boost::bind(&FrameWork::AddMap, this, _1, _2),
+    storage.Init( boost::bind(&FrameWork::AddMap, this, _1),
                   boost::bind(&FrameWork::RemoveMap, this, _1));
   }
 
diff --git a/map/map_tests/map_foreach_test.cpp b/map/map_tests/map_foreach_test.cpp
index c0ff465fee..3d853d770f 100644
--- a/map/map_tests/map_foreach_test.cpp
+++ b/map/map_tests/map_foreach_test.cpp
@@ -161,7 +161,7 @@ public:
   template <class ToDo>
   void ForEachFeature(m2::RectD const & /*rect*/, ToDo toDo)
   {
-    feature::ForEachFromDat<FeatureType>(m_fDat, toDo);
+    feature::ForEachFromDat(m_fDat, toDo);
   }
 };
 
@@ -237,7 +237,7 @@ UNIT_TEST(IndexForEachTest)
 
   model::FeaturesFetcher src1;
   src1.InitClassificator();
-  src1.AddMap(path + ".dat", path + ".dat.idx");
+  src1.AddMap(path + DATA_FILE_EXTENSION);
 
   feature::DataHeader mapInfo;
   TEST_GREATER(feature::ReadDataHeader(path + ".dat", mapInfo), 0, ());
diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp
index df585a3c08..9067942c9f 100644
--- a/platform/platform_tests/platform_test.cpp
+++ b/platform/platform_tests/platform_test.cpp
@@ -49,7 +49,7 @@ UNIT_TEST(WritablePathForFile)
 UNIT_TEST(ReadPathForFile)
 {
   char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp";
-  char const * arr[] = { "drawing_rules.bin", "basic.skn", "classificator.txt", "minsk-pass.dat" };
+  char const * arr[] = { "drawing_rules.bin", "basic.skn", "classificator.txt", "minsk-pass.wmw" };
   Platform & p = GetPlatform();
   for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
   {
@@ -61,7 +61,7 @@ UNIT_TEST(ReadPathForFile)
   {
     p.ReadPathForFile(NON_EXISTING_FILE);
   }
-  catch (FileAbsentException const & e)
+  catch (FileAbsentException const &)
   {
     wasException = true;
   }
diff --git a/storage/defines.hpp b/storage/defines.hpp
index 0283acdc0a..cb26d55241 100644
--- a/storage/defines.hpp
+++ b/storage/defines.hpp
@@ -4,10 +4,13 @@
 
 #include "../std/string.hpp"
 
-#define DATA_FILE_EXTENSION ".dat"
-#define GEOMETRY_FILE_EXTENSION ".geom"
-#define TRIANGLES_FILE_EXTENSION ".trg"
-#define INDEX_FILE_EXTENSION ".idx"
+
+#define DATA_FILE_EXTENSION ".mwm"
+#define DATA_FILE_TAG "dat"
+#define GEOMETRY_FILE_TAG "geom"
+#define TRIANGLE_FILE_TAG "trg"
+#define INDEX_FILE_TAG "idx"
+
 
 //#define WORLD_DATA_FILE "world" DATA_FILE_EXTENSION
 
diff --git a/storage/storage.cpp b/storage/storage.cpp
index 8e8ddd1c87..d25faaa8c4 100644
--- a/storage/storage.cpp
+++ b/storage/storage.cpp
@@ -25,11 +25,12 @@ namespace storage
     m_removeMap = removeFunc;
 
     // activate all downloaded maps
+    Platform & p = GetPlatform();
     Platform::FilesList filesList;
-    string const dataPath = GetPlatform().WritableDir();
-    GetPlatform().GetFilesInDir(dataPath, "*" DATA_FILE_EXTENSION, filesList);
+    string const dataPath = p.WritableDir();
+    p.GetFilesInDir(dataPath, "*" DATA_FILE_EXTENSION, filesList);
     for (Platform::FilesList::iterator it = filesList.begin(); it != filesList.end(); ++it)
-      m_addMap(dataPath + *it, dataPath + *it + INDEX_FILE_EXTENSION);
+      m_addMap(dataPath + *it);
   }
 
   string Storage::UpdateBaseUrl() const
@@ -297,7 +298,7 @@ namespace storage
         m_countryProgress.first = (m_countryProgress.second - size.second);
       // activate downloaded map piece
       string const datFile = FileFromUrl(url);
-      m_addMap(datFile, datFile + INDEX_FILE_EXTENSION);
+      m_addMap(datFile);
     }
     DownloadNextCountryFromQueue();
   }
diff --git a/storage/storage.hpp b/storage/storage.hpp
index e51632c198..dca6bf38e0 100644
--- a/storage/storage.hpp
+++ b/storage/storage.hpp
@@ -62,7 +62,7 @@ namespace storage
 
     /// @name Communicate with Framework
     //@{
-    typedef boost::function<void (string const &, string const &)> TAddMapFunction;
+    typedef boost::function<void (string const &)> TAddMapFunction;
     typedef boost::function<void (string const &)> TRemoveMapFunction;
     TAddMapFunction m_addMap;
     TRemoveMapFunction m_removeMap;