diff --git a/coding/coding_tests/file_container_test.cpp b/coding/coding_tests/file_container_test.cpp
index 83291c8975..4757ed2a06 100644
--- a/coding/coding_tests/file_container_test.cpp
+++ b/coding/coding_tests/file_container_test.cpp
@@ -147,7 +147,7 @@ namespace
                       char const * key[], char const * value[], size_t count)
   {
     FilesContainerR reader(fName);
-    LOG(LINFO, ("Size=", reader.GetSize()));
+    LOG(LINFO, ("Size=", reader.GetFileSize()));
 
     for (size_t i = 0; i < count; ++i)
     {
diff --git a/coding/file_container.hpp b/coding/file_container.hpp
index d77e8587a4..64b2865f15 100644
--- a/coding/file_container.hpp
+++ b/coding/file_container.hpp
@@ -98,7 +98,8 @@ public:
       f(m_info[i].m_tag);
   }
 
-  inline uint64_t GetSize() const { return m_source.Size(); }
+  inline uint64_t GetFileSize() const { return m_source.Size(); }
+  inline string GetFileName() const { return m_source.GetName(); }
 
 private:
   ReaderT m_source;
diff --git a/coding/reader.hpp b/coding/reader.hpp
index bb4e4ed08f..6be215484f 100644
--- a/coding/reader.hpp
+++ b/coding/reader.hpp
@@ -146,9 +146,7 @@ public:
 
   virtual ModelReader * CreateSubReader(uint64_t pos, uint64_t size) const = 0;
 
-  bool IsEqual(string const & name) const;
-
-  string GetName() const { return m_name; }
+  inline string GetName() const { return m_name; }
 };
 
 // Reader pointer class for data files.
@@ -163,6 +161,8 @@ public:
   {
     return m_p->CreateSubReader(pos, size);
   }
+
+  inline string GetName() const { return m_p->GetName(); }
 };
 
 
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 2179a4be56..14d06253cf 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -94,6 +94,13 @@ public:
     return m_LimitRect ;
   }
 
+  inline m2::PointD GetCenter() const
+  {
+    ASSERT_EQUAL ( GetFeatureType(), feature::GEOM_POINT, () );
+    ParseCommon();
+    return m_Center;
+  }
+
   class GetTypesFn
   {
   public:
diff --git a/indexer/index.hpp b/indexer/index.hpp
index e734a4c789..68479f77f7 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -22,10 +22,12 @@ public:
   IndexFactory m_factory;
 
   MwmValue(string const & name);
+
   inline feature::DataHeader const & GetHeader() const
   {
     return m_factory.GetHeader();
   }
+  inline string GetFileName() const { return m_cont.GetFileName(); }
 };
 
 class Index : public MwmSet