diff --git a/3party/jansson/myjansson.hpp b/3party/jansson/myjansson.hpp
index 5a6c438d34..3fe201c4d5 100644
--- a/3party/jansson/myjansson.hpp
+++ b/3party/jansson/myjansson.hpp
@@ -102,6 +102,7 @@ template <typename T,
 inline my::JSONPtr ToJSON(T value) { return my::NewJSONInt(value); }
 inline my::JSONPtr ToJSON(double value) { return my::NewJSONReal(value); }
 inline my::JSONPtr ToJSON(bool value) { return my::NewJSONBool(value); }
+inline my::JSONPtr ToJSON(char const * s) { return my::NewJSONString(s); }
 
 template <typename T>
 void ToJSONObject(json_t & root, std::string const & field, T const & value)
diff --git a/base/visitor.hpp b/base/visitor.hpp
index 26dc1db57c..d3c1c11970 100644
--- a/base/visitor.hpp
+++ b/base/visitor.hpp
@@ -3,8 +3,6 @@
 #include <sstream>
 #include <string>
 
-namespace base
-{
 class DebugPrintVisitor
 {
 public:
@@ -29,7 +27,6 @@ private:
   bool m_empty = true;
   std::ostringstream m_os;
 };
-}  // namespace base
 
 #define DECLARE_VISITOR(...)          \
   template <typename Visitor>         \
@@ -46,7 +43,7 @@ private:
 #define DECLARE_DEBUG_PRINT(className)               \
   friend std::string DebugPrint(className const & c) \
   {                                                  \
-    base::DebugPrintVisitor visitor(#className);     \
+    DebugPrintVisitor visitor(#className);           \
     c.Visit(visitor);                                \
     return visitor.ToString();                       \
   }
diff --git a/generator/gen_mwm_info.hpp b/generator/gen_mwm_info.hpp
index de72c00cc0..2ada261306 100644
--- a/generator/gen_mwm_info.hpp
+++ b/generator/gen_mwm_info.hpp
@@ -53,13 +53,15 @@ public:
     BaseT::Flush(sink);
   }
 
-  /// Find a feature id for an OSM id. Returns 0 if the feature was not found.
-  uint32_t GetFeatureID(osm::Id const & id) const
+  /// Find a feature id for an OSM id.
+  bool GetFeatureID(osm::Id const & id, uint32_t & result) const
   {
     auto const it = std::lower_bound(m_data.begin(), m_data.end(), id, LessID());
-    if (it != m_data.end() && it->first == id)
-      return it->second;
-    return 0;
+    if (it == m_data.end() || it->first != id)
+        return false;
+
+    result = it->second;
+    return true;
   }
 
   template <class Fn>
@@ -79,7 +81,7 @@ public:
     }
     catch (FileReader::Exception const & e)
     {
-      LOG(LERROR, ("Exception while reading osm id to feature id mapping file:", filename,
+      LOG(LERROR, ("Exception while reading osm id to feature id mapping from file", filename,
                    ". Msg:", e.Msg()));
       return false;
     }
diff --git a/generator/generator.pro b/generator/generator.pro
index f5325f8c11..ceb72de12f 100644
--- a/generator/generator.pro
+++ b/generator/generator.pro
@@ -54,11 +54,11 @@ SOURCES += \
     traffic_generator.cpp \
     transit_generator.cpp \
     ugc_db.cpp \
+    ugc_section_builder.cpp \
     ugc_translator.cpp \
     unpack_mwm.cpp \
     utils.cpp \
     viator_dataset.cpp \
-    ugc_section_builder.cpp
 
 HEADERS += \
     altitude_generator.hpp \
@@ -110,10 +110,10 @@ HEADERS += \
     traffic_generator.hpp \
     transit_generator.hpp \
     ugc_db.hpp \
+    ugc_section_builder.hpp \
     ugc_translator.hpp \
     unpack_mwm.hpp \
     utils.hpp \
     viator_dataset.hpp \
     ways_merger.hpp \
     world_map_generator.hpp \
-    ugc_section_builder.hpp
diff --git a/generator/generator_tests/ugc_test.cpp b/generator/generator_tests/ugc_test.cpp
index 9f7df6fde4..5ff7817b44 100644
--- a/generator/generator_tests/ugc_test.cpp
+++ b/generator/generator_tests/ugc_test.cpp
@@ -12,8 +12,8 @@ std::string g_database(R"LLL(
                        PRAGMA foreign_keys=OFF;
                        BEGIN TRANSACTION;
                        CREATE TABLE ratings (key bigint, value blob);
-                       INSERT INTO "ratings" VALUES(9826352,'{"osm_id":9826352,"total_rating":10.34,"votes":721,"ratings":[{"id":2,"value":3.4},{"id":2,"value":6.0001}],"reviews":[{"id":7864532,"text":"The best service on the Earth","lang":"en","author":"Robert","rating":8.5,"date":1234567}]}');
-                       INSERT INTO "ratings" VALUES(9826353,'{"osm_id":9826353,"total_rating":0.34,"votes":1,"ratings":[{"id":2,"value":3.4},{"id":3,"value":6.0001},{"id":6,"value":0.0001}],"reviews":[{"id":78645323924,"text":"Изумительно!","lang":"ru","author":"Вася","rating":10,"date":1234569}]}');
+                       INSERT INTO "ratings" VALUES(9826352,'{"osm_id":9826352,"total_rating":10.34,"based_on":721,"ratings":[{"key":"2","value":3.4},{"key":"2","value":6.0001}],"reviews":[{"id":7864532, "text":{"text":"The best service on the Earth","lang":"en"},"author":"Robert","rating":8.5,"date":1234567}]}');
+                       INSERT INTO "ratings" VALUES(9826353,'{"osm_id":9826353,"total_rating":0.34,"based_on":1,"ratings":[{"key":"2","value":3.4},{"key":"3","value":6.0001},{"key":"6","value":0.0001}],"reviews":[{"id":78645323924,"text":{"text":"Изумительно!","lang":"ru"},"author":"Вася","rating":10,"date":1234569}]}');
                        CREATE INDEX key_index ON ratings (key);
                        COMMIT;
 )LLL");
@@ -23,12 +23,10 @@ UNIT_TEST(UGC_SmokeTest)
   generator::UGCDB db(":memory:");
   bool create = db.Exec(g_database);
   TEST(create, ("Can't open database"));
-  osm::Id id = osm::Id(1);
+  osm::Id id = osm::Id(9826353);
   std::vector<uint8_t> blob;
   bool rc = db.Get(id, blob);
   TEST(rc, ("Can't load data for", id));
-  std::string result(blob.cbegin(), blob.cend());
-  std::cout << result << std::endl;
 }
 
 UNIT_TEST(UGC_TranslateRatingTest)
diff --git a/generator/osm_id.cpp b/generator/osm_id.cpp
index 0b6faa3787..a7414a854b 100644
--- a/generator/osm_id.cpp
+++ b/generator/osm_id.cpp
@@ -38,6 +38,11 @@ uint64_t Id::OsmId() const
   return m_encodedId & RESET;
 }
 
+uint64_t Id::EncodedId() const
+{
+  return m_encodedId;
+}
+
 bool Id::IsNode() const
 {
   return ((m_encodedId & NODE) == NODE);
diff --git a/generator/osm_id.hpp b/generator/osm_id.hpp
index 703cd18560..064fbb2a47 100644
--- a/generator/osm_id.hpp
+++ b/generator/osm_id.hpp
@@ -21,6 +21,7 @@ public:
   static Id Relation(uint64_t osmId);
 
   uint64_t OsmId() const;
+  uint64_t EncodedId() const;
   bool IsNode() const;
   bool IsWay() const;
   bool IsRelation() const;
diff --git a/generator/routing_generator.cpp b/generator/routing_generator.cpp
index 7b3595c8ad..9b294c040e 100644
--- a/generator/routing_generator.cpp
+++ b/generator/routing_generator.cpp
@@ -39,10 +39,16 @@ using RawRouteResult = InternalRouteResult;
 
 static double const EQUAL_POINT_RADIUS_M = 2.0;
 
-/// Find a feature id for an OSM way id. Returns 0 if the feature was not found.
-uint32_t GetRoadFeatureID(gen::OsmID2FeatureID const & osm2ft, uint64_t wayId)
+/// Find a feature id for an OSM way id.
+bool GetRoadFeatureID(gen::OsmID2FeatureID const & osm2ft, uint64_t wayId, uint32_t & result)
 {
-  return osm2ft.GetFeatureID(osm::Id::Way(wayId));
+  return osm2ft.GetFeatureID(osm::Id::Way(wayId), result);
+}
+
+bool HasWay(gen::OsmID2FeatureID const & osm2ft, uint64_t wayId)
+{
+  uint32_t unused;
+  return osm2ft.GetFeatureID(osm::Id::Way(wayId), unused);
 }
 
 // For debug purposes only. So I do not use constanst or string representations.
@@ -121,7 +127,7 @@ void FindCrossNodes(osrm::NodeDataVectorT const & nodeData, gen::OsmID2FeatureID
       auto const & startSeg = data.m_segments.front();
       auto const & endSeg = data.m_segments.back();
       // Check if we have geometry for our candidate.
-      if (GetRoadFeatureID(osm2ft, startSeg.wayId) || GetRoadFeatureID(osm2ft, endSeg.wayId))
+      if (HasWay(osm2ft, startSeg.wayId) || HasWay(osm2ft, endSeg.wayId))
       {
         // Check mwm borders crossing.
         for (m2::RegionD const & border: regionBorders)
@@ -178,7 +184,9 @@ void FindCrossNodes(osrm::NodeDataVectorT const & nodeData, gen::OsmID2FeatureID
           {
             FeatureType ft;
             Index::FeaturesLoaderGuard loader(index, mwmId);
-            if (loader.GetFeatureByIndex(GetRoadFeatureID(osm2ft, startSeg.wayId), ft))
+            uint32_t index = 0;
+            if (GetRoadFeatureID(osm2ft, startSeg.wayId, index) &&
+                loader.GetFeatureByIndex(index, ft))
             {
               LOG(LINFO,
                   ("Double border intersection", wgsIntersection, "rank:", GetWarningRank(ft)));
@@ -314,8 +322,8 @@ void BuildRoutingIndex(std::string const & baseDir, std::string const & countryN
       ++all;
 
       // now need to determine feature id and segments in it
-      uint32_t const fID = GetRoadFeatureID(osm2ft, seg.wayId);
-      if (fID == 0)
+      uint32_t fID = 0;
+      if (!GetRoadFeatureID(osm2ft, seg.wayId, fID))
       {
         LOG(LWARNING, ("No feature id for way:", seg.wayId));
         continue;
diff --git a/generator/ugc_db.cpp b/generator/ugc_db.cpp
index 494999c315..d7a7fec5b1 100644
--- a/generator/ugc_db.cpp
+++ b/generator/ugc_db.cpp
@@ -21,10 +21,6 @@ namespace generator
 static int callback(void * results_ptr, int argc, char ** argv, char ** azColName)
 {
   Results & results = *reinterpret_cast<Results *>(results_ptr);
-
-  if (argc > 1)
-    results.values << "[";
-
   for (size_t i = 0; i < argc; i++)
   {
     if (results.empty)
@@ -35,9 +31,6 @@ static int callback(void * results_ptr, int argc, char ** argv, char ** azColNam
     results.values << (argv[i] ? argv[i] : "{}");
   }
 
-  if (argc > 1)
-    results.values << "]";
-
   return 0;
 }
 
@@ -62,10 +55,11 @@ bool UGCDB::Get(osm::Id const & id, std::vector<uint8_t> & blob)
 {
   if (!m_db)
     return false;
-
   Results results;
+  results.values << "[";
+
   std::ostringstream cmd;
-  cmd << "SELECT value FROM ratings WHERE key=" << id.OsmId() << ";";
+  cmd << "SELECT value FROM ratings WHERE key=" << id.EncodedId() << ";";
 
   char * zErrMsg = nullptr;
   auto rc = sqlite3_exec(m_db, cmd.str().c_str(), callback, &results, &zErrMsg);
@@ -75,6 +69,7 @@ bool UGCDB::Get(osm::Id const & id, std::vector<uint8_t> & blob)
     sqlite3_free(zErrMsg);
     return false;
   }
+  results.values << "]";
 
   return ValueToBlob(results.values.str(), blob);
 }
diff --git a/generator/ugc_section_builder.cpp b/generator/ugc_section_builder.cpp
index 0118c3a114..2b9ef86a0d 100644
--- a/generator/ugc_section_builder.cpp
+++ b/generator/ugc_section_builder.cpp
@@ -20,6 +20,8 @@ bool BuildUgcMwmSection(std::string const & srcDbFilename, std::string const & m
 {
   using ugc::binary::IndexUGC;
 
+  LOG(LINFO, ("Build UGC section"));
+
   gen::OsmID2FeatureID osmIdsToFeatureIds;
   if (!osmIdsToFeatureIds.ReadFromFile(osmToFeatureFilename))
     return false;
diff --git a/generator/ugc_translator.cpp b/generator/ugc_translator.cpp
index 150a2af030..59b73cac16 100644
--- a/generator/ugc_translator.cpp
+++ b/generator/ugc_translator.cpp
@@ -8,6 +8,8 @@
 
 #include "base/string_utils.hpp"
 
+#include <vector>
+
 #include "3party/jansson/myjansson.hpp"
 
 namespace generator
@@ -18,14 +20,22 @@ UGCTranslator::UGCTranslator(std::string const & dbFilename) : m_db(dbFilename)
 
 bool UGCTranslator::TranslateUGC(osm::Id const & id, ugc::UGC & ugc)
 {
-  std::vector<uint8_t> blob;
+  std::vector<uint8_t> src;
 
-  if (!m_db.Get(id, blob))
+  if (!m_db.Get(id, src))
     return false;
 
-  std::string src(blob.cbegin(), blob.cend());
+  std::string str(src.cbegin(), src.cend());
 
-  ugc::DeserializerJsonV0 des(src);
+  my::Json json(str);
+
+  if (json_array_size(json.get()) != 1)
+  {
+    LOG(LWARNING, ("Osm id duplication in UGC database", id));
+    return false;
+  }
+
+  ugc::DeserializerJsonV0 des(json_array_get(json.get(), 0));
 
   des(ugc);
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/MWMUGCCommentCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/MWMUGCCommentCell.mm
index 163b7e22fa..62d1e945fd 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/MWMUGCCommentCell.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/MWMUGCCommentCell.mm
@@ -58,7 +58,7 @@ NSString * formattedDateFrom(ugc::Time time)
 
 - (void)configWithReview:(ugc::Review const &)review
 {
-  self.author.text = @(review.m_author.m_name.c_str());
+  self.author.text = @(review.m_author.c_str());
   self.comment.text = @(review.m_text.m_text.c_str());
   self.date.text = formattedDateFrom(review.m_time);
 }
diff --git a/partners_api/locals_api.cpp b/partners_api/locals_api.cpp
index c061304d95..72f304335f 100644
--- a/partners_api/locals_api.cpp
+++ b/partners_api/locals_api.cpp
@@ -18,7 +18,7 @@ namespace
 {
 using namespace locals;
 
-void ParseError(std::string const & src, ErrorCode & errorCode, std::string & message)
+void ParseError(std::string const & src, int & errorCode, std::string & message)
 {
   message.clear();
   errorCode = 0;
diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh
index 1873741b60..3fa5ae09b2 100755
--- a/tools/unix/generate_planet.sh
+++ b/tools/unix/generate_planet.sh
@@ -318,10 +318,21 @@ if [ ! -f "$VIATOR_FILE" -a -n "${VIATOR_KEY-}" ]; then
 fi
 
 # Download UGC (user generated content) database.
-if [ -n "${UGC-}" ]; then
+if if [ ! -f "$UGC_FILE" -a -n "${UGC_DATABASE_URL-}" ]; then
   putmode "Step UGC: Dowloading UGC database"
   (
-    curl "https://dummy.ru/" --output "$UGC_FILE" --silent || fail "Failed to download UGC database."
+    curl "$UGC_DATABASE_URL" --output "$UGC_FILE" --silent || true
+    if [ -f "$UGC_FILE" -a "$(wc -l < "$UGC_FILE" || echo 0)" -gt 100 ]; then
+      echo "UGC database have been downloaded. Please ensure this line is before Step 4." >> "$PLANET_LOG"
+    else
+      if [ -n "${OLD_INTDIR-}" -a -f "${OLD_INTDIR-}/$(basename "$UGC_FILE")" ]; then
+        cp "$OLD_INTDIR/$(basename "$UGC_FILE")" "$INTDIR"
+        warn "Failed to download UGC database! Using older UGC database."
+      else
+        warn "Failed to download UGC database!"
+      fi
+      [ -n "${MAIL-}" ] && tail "$LOG_PATH/ugc.log" | mailx -s "Failed to download UGC database at $(hostname), please hurry to fix" "$MAIL"
+    fi
   ) &
 fi
 
diff --git a/ugc/api.cpp b/ugc/api.cpp
index 523f47fc4d..5336d73f59 100644
--- a/ugc/api.cpp
+++ b/ugc/api.cpp
@@ -13,7 +13,7 @@ namespace ugc
 {
 Api::Api(Index const & index, std::string const & filename)
   : m_storage(filename)
-, m_loader(index)
+  , m_loader(index)
 {
 }
 
@@ -35,11 +35,8 @@ void Api::GetUGCImpl(FeatureID const & id, UGCCallback callback)
     return;
   }
 
-  UGC ugc;
-  UGCUpdate update;
-
-  m_storage.GetUGCUpdate(id, update);
-  m_loader.GetUGC(id, ugc);
+  auto const update = m_storage.GetUGCUpdate(id);
+  auto const ugc = m_loader.GetUGC(id);
 
   GetPlatform().RunOnGuiThread([ugc, update, callback] { callback(ugc, update); });
 }
diff --git a/ugc/binary/serdes.cpp b/ugc/binary/serdes.cpp
index 70643d0e1d..4051fdda6a 100644
--- a/ugc/binary/serdes.cpp
+++ b/ugc/binary/serdes.cpp
@@ -18,6 +18,7 @@ public:
   void VisitVarUint(uint32_t, char const * /* name */ = nullptr) {}
   void VisitVarUint(uint64_t, char const * /* name */ = nullptr) {}
   virtual void VisitRating(float const f, char const * /* name */ = nullptr) {}
+  virtual void VisitLang(uint8_t const index, char const * /* name */ = nullptr) {}
   virtual void operator()(string const & /* s */, char const * /* name */ = nullptr) {}
   virtual void operator()(Sentiment const /* sentiment */, char const * /* name */ = nullptr) {}
   virtual void operator()(Time const /* time */, char const * /* name */ = nullptr) {}
@@ -102,14 +103,15 @@ void UGCSeriaizer::CollectTexts()
   }
 }
 
-std::string DebugPrint(Version v)
+std::string DebugPrint(Version const & v)
 {
   switch (v)
   {
   case Version::V0: return "Version 0";
-  default: ASSERT(false, ("Unknown version", static_cast<uint64_t>(v)));
   }
 
+  ASSERT(false, ("Unknown version", static_cast<uint64_t>(v)));
+
   return {};
 }
 }  // namespace binary
diff --git a/ugc/binary/serdes.hpp b/ugc/binary/serdes.hpp
index 3af82a0cdd..b3d050bc28 100644
--- a/ugc/binary/serdes.hpp
+++ b/ugc/binary/serdes.hpp
@@ -167,7 +167,7 @@ public:
   bool Deserialize(R & reader, FeatureIndex index, UGC & ugc)
   {
     NonOwningReaderSource source(reader);
-    Version v = ReadPrimitiveFromSource<Version>(source);
+    auto const v = ReadPrimitiveFromSource<Version>(source);
 
     auto subReader = reader.CreateSubReader(source.Pos(), source.Size());
 
@@ -320,6 +320,6 @@ private:
   bool m_initialized = false;
 };
 
-std::string DebugPrint(Version v);
+std::string DebugPrint(Version const & v);
 }  // namespace binary
 }  // namespace ugc
diff --git a/ugc/binary/visitors.hpp b/ugc/binary/visitors.hpp
index d70edc1ad1..a32d5d6a54 100644
--- a/ugc/binary/visitors.hpp
+++ b/ugc/binary/visitors.hpp
@@ -51,6 +51,11 @@ public:
     VisitVarUint(d, name);
   }
 
+  void VisitLang(uint8_t const index, char const * /* name */ = nullptr)
+  {
+    WriteToSink(m_sink, index);
+  }
+
   template <typename T>
   void VisitVarUint(T const & t, char const * /* name */ = nullptr)
   {
@@ -131,6 +136,11 @@ public:
     f = static_cast<float>(d) / 10;
   }
 
+  void VisitLang(uint8_t & index, char const * /* name */ = nullptr)
+  {
+    ReadPrimitiveFromSource<uint8_t>(m_source, index);
+  }
+
   template <typename T>
   void VisitVarUint(T & t, char const * /* name */ = nullptr)
   {
diff --git a/ugc/loader.cpp b/ugc/loader.cpp
index b28d9e3461..916603be8c 100644
--- a/ugc/loader.cpp
+++ b/ugc/loader.cpp
@@ -1,7 +1,5 @@
 #include "ugc/loader.hpp"
 
-#include "ugc/types.hpp"
-
 #include "indexer/feature.hpp"
 #include "indexer/index.hpp"
 
@@ -11,24 +9,24 @@ namespace ugc
 {
 Loader::Loader(Index const & index) : m_index(index) {}
 
-void Loader::GetUGC(FeatureID const & featureId, UGC & result)
+UGC Loader::GetUGC(FeatureID const & featureId)
 {
-  UGC ugc;
-  auto const & handle = m_index.GetMwmHandleById(featureId.m_mwmId);
+  auto const handle = m_index.GetMwmHandleById(featureId.m_mwmId);
 
   if (!handle.IsAlive())
-    return;
+    return {};
 
   auto const & value = *handle.GetValue<MwmValue>();
 
   if (!value.m_cont.IsExist(UGC_FILE_TAG))
-    return;
+    return {};
 
   auto readerPtr = value.m_cont.GetReader(UGC_FILE_TAG);
 
+  UGC ugc;
   if (!m_d.Deserialize(*readerPtr.GetPtr(), featureId.m_index, ugc))
-    return;
+    return {};
 
-  result = std::move(ugc);
+  return ugc;
 }
 }  // namespace ugc
diff --git a/ugc/loader.hpp b/ugc/loader.hpp
index 45e332bd0c..a48a6f537a 100644
--- a/ugc/loader.hpp
+++ b/ugc/loader.hpp
@@ -1,22 +1,21 @@
 #pragma once
 
 #include "ugc/binary/serdes.hpp"
+#include "ugc/types.hpp"
 
 class Index;
 struct FeatureID;
 
 namespace ugc
 {
-struct UGC;
-
 class Loader
 {
 public:
   Loader(Index const & index);
-  void GetUGC(FeatureID const & featureId, UGC & ugc);
+  UGC GetUGC(FeatureID const & featureId);
 
 private:
-    Index const & m_index;
-    binary::UGCDeserializer m_d;
+  Index const & m_index;
+  binary::UGCDeserializer m_d;
 };
 }  // namespace ugc
diff --git a/ugc/serdes.hpp b/ugc/serdes.hpp
index 9f514988af..51f36976d8 100644
--- a/ugc/serdes.hpp
+++ b/ugc/serdes.hpp
@@ -45,6 +45,11 @@ public:
     VisitVarUint(d);
   }
 
+  void VisitLang(uint8_t const index, char const * /* name */ = nullptr)
+  {
+    WriteToSink(m_sink, index);
+  }
+
   template <typename T>
   void VisitVarUint(T const & t, char const * /* name */ = nullptr)
   {
@@ -117,6 +122,11 @@ public:
     f = static_cast<float>(d) / 10;
   }
 
+  void VisitLang(uint8_t & index, char const * /* name */ = nullptr)
+  {
+    ReadPrimitiveFromSource<uint8_t>(m_source, index);
+  }
+
   template <typename T>
   void VisitVarUint(T & t, char const * /* name */ = nullptr)
   {
diff --git a/ugc/serdes_json.hpp b/ugc/serdes_json.hpp
index c850db6cbe..6fe587f352 100644
--- a/ugc/serdes_json.hpp
+++ b/ugc/serdes_json.hpp
@@ -79,6 +79,11 @@ public:
     ToJSONObject(*m_json, name, t);
   }
 
+  void VisitLang(uint8_t const index, char const * name = nullptr)
+  {
+    ToJSONObject(*m_json, name, StringUtf8Multilang::GetLangByCode(index));
+  }
+
 private:
   template <typename Fn>
   void NewScopeWith(my::JSONPtr json_object, char const * name, Fn && fn)
@@ -109,7 +114,7 @@ public:
   template <typename Source,
             typename std::enable_if<
               !std::is_convertible<Source, std::string>::value, Source>::type * = nullptr>
-  DeserializerJsonV0(Source & source)
+  explicit DeserializerJsonV0(Source & source)
   {
     std::string src(source.Size(), '\0');
     source.Read(static_cast<void *>(&src[0]), source.Size());
@@ -117,12 +122,17 @@ public:
     m_json = m_jsonObject.get();
   }
 
-  DeserializerJsonV0(std::string const & source)
+  explicit DeserializerJsonV0(std::string const & source)
     : m_jsonObject(source)
     , m_json(m_jsonObject.get())
   {
   }
 
+  explicit DeserializerJsonV0(json_t * json)
+    : m_json(json)
+  {
+  }
+
   void operator()(bool & d, char const * name = nullptr) { FromJSONObject(m_json, name, d); }
   void operator()(uint8_t & d, char const * name = nullptr) { FromJSONObject(m_json, name, d); }
   void operator()(uint32_t & d, char const * name = nullptr) { FromJSONObject(m_json, name, d); }
@@ -188,6 +198,13 @@ public:
     FromJSONObject(m_json, name, t);
   }
 
+  void VisitLang(uint8_t & index, char const * name = nullptr)
+  {
+    std::string lang;
+    FromJSONObject(m_json, name, lang);
+    index = StringUtf8Multilang::GetLangIndex(lang);
+  }
+
 private:
   json_t * SaveContext(char const * name = nullptr)
   {
diff --git a/ugc/storage.cpp b/ugc/storage.cpp
index fe966264a7..53556d97ac 100644
--- a/ugc/storage.cpp
+++ b/ugc/storage.cpp
@@ -10,13 +10,10 @@ Storage::Storage(std::string const & filename)
   Load();
 }
 
-void Storage::GetUGCUpdate(FeatureID const & id, UGCUpdate & ugc) const
+UGCUpdate Storage::GetUGCUpdate(FeatureID const & id) const
 {
-  auto const it = m_ugc.find(id);
-  if (it == end(m_ugc))
-    return;
-
-  ugc = it->second;
+  // Dummy
+  return {};
 }
 
 void Storage::SetUGCUpdate(FeatureID const & id, UGCUpdate const & ugc)
diff --git a/ugc/storage.hpp b/ugc/storage.hpp
index c6df8c5f67..0b97a0d616 100644
--- a/ugc/storage.hpp
+++ b/ugc/storage.hpp
@@ -14,7 +14,7 @@ class Storage
 public:
   explicit Storage(std::string const & filename);
 
-  void GetUGCUpdate(FeatureID const & id, UGCUpdate & ugc) const;
+  UGCUpdate GetUGCUpdate(FeatureID const & id) const;
   void SetUGCUpdate(FeatureID const & id, UGCUpdate const & ugc);
 
   void Save();
diff --git a/ugc/types.hpp b/ugc/types.hpp
index fd60258bba..2f8a398504 100644
--- a/ugc/types.hpp
+++ b/ugc/types.hpp
@@ -26,7 +26,7 @@ struct TranslationKey
   TranslationKey(std::string const & key): m_key(key) {}
   TranslationKey(char const * key): m_key(key) {}
 
-  DECLARE_VISITOR(visitor(m_key, "key"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TranslationKey, visitor(m_key, "key"))
 
   bool operator==(TranslationKey const & rhs) const { return m_key == rhs.m_key; }
   bool operator<(TranslationKey const & rhs) const { return m_key < rhs.m_key; }
@@ -34,11 +34,6 @@ struct TranslationKey
   std::string m_key;
 };
 
-std::string DebugPrint(TranslationKey const & key)
-{
-  return "TranslationKey [ " + key.m_key + " ]";
-}
-
 enum class Sentiment
 {
   Positive,
@@ -91,7 +86,7 @@ struct RatingRecord
   float m_value{};
 };
 
-std::string DebugPrint(RatingRecord const & ratingRecord)
+inline std::string DebugPrint(RatingRecord const & ratingRecord)
 {
   std::ostringstream os;
   os << "RatingRecord [ " << DebugPrint(ratingRecord.m_key) << " " << ratingRecord.m_value
@@ -108,7 +103,7 @@ struct UID
 
   std::string ToString() const { return NumToHex(m_hi) + NumToHex(m_lo); }
 
-  DECLARE_VISITOR(visitor(m_hi, "hi"), visitor(m_lo, "lo"));
+  DECLARE_VISITOR_AND_DEBUG_PRINT(UID, visitor(m_hi, "hi"), visitor(m_lo, "lo"))
 
   bool operator==(UID const & rhs) const { return m_hi == rhs.m_hi && m_lo == rhs.m_lo; }
 
@@ -116,13 +111,6 @@ struct UID
   uint64_t m_lo{};
 };
 
-std::string DebugPrint(UID const & uid)
-{
-  std::ostringstream os;
-  os << "UID [ " << uid.ToString() << " ]";
-  return os.str();
-}
-
 using Author = std::string;
 
 struct Text
@@ -130,7 +118,7 @@ struct Text
   Text() = default;
   Text(std::string const & text, uint8_t const lang) : m_text(text), m_lang(lang) {}
 
-  DECLARE_VISITOR(visitor(m_lang, "lang"), visitor(m_text, "text"));
+  DECLARE_VISITOR(visitor(m_text, "text"), visitor.VisitLang(m_lang, "lang"))
 
   bool operator==(Text const & rhs) const { return m_lang == rhs.m_lang && m_text == rhs.m_text; }
 
@@ -138,7 +126,7 @@ struct Text
   uint8_t m_lang = StringUtf8Multilang::kDefaultCode;
 };
 
-std::string DebugPrint(Text const & text)
+inline std::string DebugPrint(Text const & text)
 {
   std::ostringstream os;
   os << "Text [ " << StringUtf8Multilang::GetLangByCode(text.m_lang) << ": " << text.m_text
@@ -158,7 +146,7 @@ struct Review
   }
 
   DECLARE_VISITOR(visitor(m_id, "id"), visitor(m_text, "text"), visitor(m_author, "author"),
-                  visitor.VisitRating(m_rating, "rating"), visitor(m_time, "time"))
+                  visitor.VisitRating(m_rating, "rating"), visitor(m_time, "date"))
 
   bool operator==(Review const & rhs) const
   {
@@ -173,7 +161,7 @@ struct Review
   Time m_time{};
 };
 
-std::string DebugPrint(Review const & review)
+inline std::string DebugPrint(Review const & review)
 {
   std::ostringstream os;
   os << "Review [ ";
@@ -194,7 +182,7 @@ struct Attribute
   {
   }
 
-  DECLARE_VISITOR(visitor(m_key, "key"), visitor(m_value, "value"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(Attribute, visitor(m_key, "key"), visitor(m_value, "value"))
 
   bool operator==(Attribute const & rhs) const
   {
@@ -205,14 +193,6 @@ struct Attribute
   TranslationKey m_value{};
 };
 
-std::string DebugPrint(Attribute const & attribute)
-{
-  std::ostringstream os;
-  os << "Attribute [ key:" << DebugPrint(attribute.m_key)
-     << ", value:" << DebugPrint(attribute.m_value) << " ]";
-  return os.str();
-}
-
 struct UGC
 {
   UGC() = default;
@@ -231,21 +211,23 @@ struct UGC
         my::AlmostEqualAbs(m_totalRating, rhs.m_totalRating, 1e-6f) && m_basedOn == rhs.m_basedOn;
   }
 
-  bool IsValid() const
+  bool IsEmpty() const
   {
-    return (!m_ratings.empty() || !m_reviews.empty()) && m_totalRating > 1e-6 && m_basedOn > 0;
+    return !((!m_ratings.empty() || !m_reviews.empty()) && m_totalRating >= 0 && m_basedOn > 0);
   }
 
   Ratings m_ratings;
   Reviews m_reviews;
-  float m_totalRating{};
+  float m_totalRating = -1.f;
   uint32_t m_basedOn{};
 };
 
-std::string DebugPrint(UGC const & ugc)
+inline std::string DebugPrint(UGC const & ugc)
 {
   std::ostringstream os;
   os << "UGC [ ";
+  os << "total rating:" << ugc.m_totalRating << ", ";
+  os << "based on:" << ugc.m_basedOn << ", ";
   os << "records:" << ::DebugPrint(ugc.m_ratings) << ", ";
   os << "reviews:" << ::DebugPrint(ugc.m_reviews) << " ]";
   return os.str();
@@ -266,9 +248,9 @@ struct UGCUpdate
     return m_ratings == rhs.m_ratings && m_text == rhs.m_text && m_time == rhs.m_time;
   }
 
-  bool IsValid() const
+  bool IsEmpty() const
   {
-    return (!m_ratings.empty() || !m_text.m_text.empty()) && m_time != Time();
+    return !((!m_ratings.empty() || !m_text.m_text.empty()) && m_time != Time());
   }
 
   Ratings m_ratings;
@@ -276,7 +258,7 @@ struct UGCUpdate
   Time m_time{};
 };
 
-std::string DebugPrint(UGCUpdate const & ugcUpdate)
+inline std::string DebugPrint(UGCUpdate const & ugcUpdate)
 {
   std::ostringstream os;
   os << "UGCUpdate [ ";
diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj
index ef9c0a7bcc..db1e82cbff 100644
--- a/xcode/base/base.xcodeproj/project.pbxproj
+++ b/xcode/base/base.xcodeproj/project.pbxproj
@@ -44,6 +44,12 @@
 		39FD27381CC65AD000AFF551 /* timegm_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26E21CC65A0E00AFF551 /* timegm_test.cpp */; };
 		39FD27391CC65AD000AFF551 /* timer_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26E31CC65A0E00AFF551 /* timer_test.cpp */; };
 		39FD273B1CC65B1000AFF551 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675341771A3F57BF00A0A8C3 /* libbase.a */; };
+		3D74EF101F8B902C0081202C /* move_to_front.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74EF0A1F8B902A0081202C /* move_to_front.hpp */; };
+		3D74EF111F8B902C0081202C /* suffix_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF0B1F8B902B0081202C /* suffix_array.cpp */; };
+		3D74EF121F8B902C0081202C /* visitor.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74EF0C1F8B902B0081202C /* visitor.hpp */; };
+		3D74EF131F8B902C0081202C /* move_to_front.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF0D1F8B902B0081202C /* move_to_front.cpp */; };
+		3D74EF141F8B902C0081202C /* bwt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF0E1F8B902B0081202C /* bwt.cpp */; };
+		3D74EF151F8B902C0081202C /* bwt.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74EF0F1F8B902C0081202C /* bwt.hpp */; };
 		3D7815731F3A145F0068B6AC /* task_loop.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D7815711F3A145F0068B6AC /* task_loop.hpp */; };
 		3D78157B1F3D89EC0068B6AC /* waiter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D78157A1F3D89EC0068B6AC /* waiter.hpp */; };
 		56B1A0741E69DE4D00395022 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56B1A0711E69DE4D00395022 /* random.cpp */; };
@@ -164,6 +170,12 @@
 		39FD273D1CC65B1000AFF551 /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libplatform.a; path = "../../../omim-xcode-build/Debug/libplatform.a"; sourceTree = "<group>"; };
 		39FD27401CC65B2800AFF551 /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libindexer.a; path = "../../../omim-xcode-build/Debug/libindexer.a"; sourceTree = "<group>"; };
 		39FD27421CC65B4800AFF551 /* libcoding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcoding.a; path = "../../../omim-xcode-build/Debug/libcoding.a"; sourceTree = "<group>"; };
+		3D74EF0A1F8B902A0081202C /* move_to_front.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = move_to_front.hpp; sourceTree = "<group>"; };
+		3D74EF0B1F8B902B0081202C /* suffix_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = suffix_array.cpp; sourceTree = "<group>"; };
+		3D74EF0C1F8B902B0081202C /* visitor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = visitor.hpp; sourceTree = "<group>"; };
+		3D74EF0D1F8B902B0081202C /* move_to_front.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = move_to_front.cpp; sourceTree = "<group>"; };
+		3D74EF0E1F8B902B0081202C /* bwt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bwt.cpp; sourceTree = "<group>"; };
+		3D74EF0F1F8B902C0081202C /* bwt.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bwt.hpp; sourceTree = "<group>"; };
 		3D7815711F3A145F0068B6AC /* task_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = task_loop.hpp; sourceTree = "<group>"; };
 		3D78157A1F3D89EC0068B6AC /* waiter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = waiter.hpp; sourceTree = "<group>"; };
 		56B1A0711E69DE4D00395022 /* random.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = random.cpp; sourceTree = "<group>"; };
@@ -325,6 +337,12 @@
 		675341791A3F57BF00A0A8C3 /* base */ = {
 			isa = PBXGroup;
 			children = (
+				3D74EF0E1F8B902B0081202C /* bwt.cpp */,
+				3D74EF0F1F8B902C0081202C /* bwt.hpp */,
+				3D74EF0D1F8B902B0081202C /* move_to_front.cpp */,
+				3D74EF0A1F8B902A0081202C /* move_to_front.hpp */,
+				3D74EF0B1F8B902B0081202C /* suffix_array.cpp */,
+				3D74EF0C1F8B902B0081202C /* visitor.hpp */,
 				3D78157A1F3D89EC0068B6AC /* waiter.hpp */,
 				3D7815711F3A145F0068B6AC /* task_loop.hpp */,
 				F6F8E3C61EF846CE00F2DE8F /* worker_thread.cpp */,
@@ -435,6 +453,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3D74EF121F8B902C0081202C /* visitor.hpp in Headers */,
 				675341CF1A3F57E400A0A8C3 /* bits.hpp in Headers */,
 				672DD4C71E0425600078E13C /* ref_counted.hpp in Headers */,
 				675341E61A3F57E400A0A8C3 /* mutex.hpp in Headers */,
@@ -455,6 +474,7 @@
 				675342041A3F57E400A0A8C3 /* strings_bundle.hpp in Headers */,
 				672DD4C81E0425600078E13C /* stl_helpers.hpp in Headers */,
 				675341CE1A3F57E400A0A8C3 /* base.hpp in Headers */,
+				3D74EF101F8B902C0081202C /* move_to_front.hpp in Headers */,
 				675342001A3F57E400A0A8C3 /* string_format.hpp in Headers */,
 				675341F41A3F57E400A0A8C3 /* scope_guard.hpp in Headers */,
 				672DD4BF1E0425600078E13C /* collection_cast.hpp in Headers */,
@@ -475,6 +495,7 @@
 				675341FE1A3F57E400A0A8C3 /* stl_iterator.hpp in Headers */,
 				675341FA1A3F57E400A0A8C3 /* src_point.hpp in Headers */,
 				674A7E2F1C0DB03D003D48E1 /* timegm.hpp in Headers */,
+				3D74EF151F8B902C0081202C /* bwt.hpp in Headers */,
 				675341F71A3F57E400A0A8C3 /* shared_buffer_manager.hpp in Headers */,
 				56B1A0761E69DE4D00395022 /* small_set.hpp in Headers */,
 				67B52B611AD3C84E00664C17 /* thread_checker.hpp in Headers */,
@@ -629,9 +650,12 @@
 				675341F61A3F57E400A0A8C3 /* shared_buffer_manager.cpp in Sources */,
 				56B1A0741E69DE4D00395022 /* random.cpp in Sources */,
 				675341DA1A3F57E400A0A8C3 /* exception.cpp in Sources */,
+				3D74EF111F8B902C0081202C /* suffix_array.cpp in Sources */,
 				F6F8E3C81EF846CE00F2DE8F /* worker_thread.cpp in Sources */,
 				675341F91A3F57E400A0A8C3 /* src_point.cpp in Sources */,
 				675342031A3F57E400A0A8C3 /* strings_bundle.cpp in Sources */,
+				3D74EF141F8B902C0081202C /* bwt.cpp in Sources */,
+				3D74EF131F8B902C0081202C /* move_to_front.cpp in Sources */,
 				675341CD1A3F57E400A0A8C3 /* base.cpp in Sources */,
 				675342011A3F57E400A0A8C3 /* string_utils.cpp in Sources */,
 				674A7E2E1C0DB03D003D48E1 /* timegm.cpp in Sources */,
diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj
index 573237bc30..954d1df4e5 100644
--- a/xcode/generator/generator.xcodeproj/project.pbxproj
+++ b/xcode/generator/generator.xcodeproj/project.pbxproj
@@ -27,6 +27,8 @@
 		3D51BC571D5E512500F1FA8D /* region_meta.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D51BC4F1D5E512500F1FA8D /* region_meta.hpp */; };
 		3D51BC581D5E512500F1FA8D /* srtm_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D51BC501D5E512500F1FA8D /* srtm_parser.cpp */; };
 		3D51BC591D5E512500F1FA8D /* srtm_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D51BC511D5E512500F1FA8D /* srtm_parser.hpp */; };
+		3D74EF071F86841C0081202C /* ugc_section_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF051F86841C0081202C /* ugc_section_builder.cpp */; };
+		3D74EF081F86841C0081202C /* ugc_section_builder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D74EF061F86841C0081202C /* ugc_section_builder.hpp */; };
 		3DFEBF7D1EF2D58900317D5C /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEBF781EF2D58900317D5C /* utils.cpp */; };
 		3DFEBF7E1EF2D58900317D5C /* utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DFEBF791EF2D58900317D5C /* utils.hpp */; };
 		3DFEBF7F1EF2D58900317D5C /* viator_dataset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DFEBF7A1EF2D58900317D5C /* viator_dataset.cpp */; };
@@ -136,6 +138,8 @@
 		3D51BC4F1D5E512500F1FA8D /* region_meta.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = region_meta.hpp; sourceTree = "<group>"; };
 		3D51BC501D5E512500F1FA8D /* srtm_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = srtm_parser.cpp; sourceTree = "<group>"; };
 		3D51BC511D5E512500F1FA8D /* srtm_parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = srtm_parser.hpp; sourceTree = "<group>"; };
+		3D74EF051F86841C0081202C /* ugc_section_builder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ugc_section_builder.cpp; sourceTree = "<group>"; };
+		3D74EF061F86841C0081202C /* ugc_section_builder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ugc_section_builder.hpp; sourceTree = "<group>"; };
 		3DFEBF781EF2D58900317D5C /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = "<group>"; };
 		3DFEBF791EF2D58900317D5C /* utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utils.hpp; sourceTree = "<group>"; };
 		3DFEBF7A1EF2D58900317D5C /* viator_dataset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viator_dataset.cpp; sourceTree = "<group>"; };
@@ -267,6 +271,8 @@
 		6753401D1A3F2A1B00A0A8C3 /* generator */ = {
 			isa = PBXGroup;
 			children = (
+				3D74EF051F86841C0081202C /* ugc_section_builder.cpp */,
+				3D74EF061F86841C0081202C /* ugc_section_builder.hpp */,
 				5687625E1F6A9B18002C22A6 /* transit_generator.cpp */,
 				5687625F1F6A9B18002C22A6 /* transit_generator.hpp */,
 				3DFEBF811EF423FB00317D5C /* sponsored_object_storage.hpp */,
@@ -436,6 +442,7 @@
 				675340681A3F2A7400A0A8C3 /* dumper.hpp in Headers */,
 				670E7BB81EF9812B00A8E9ED /* routing_helpers.hpp in Headers */,
 				675340791A3F2A7400A0A8C3 /* osm_translator.hpp in Headers */,
+				3D74EF081F86841C0081202C /* ugc_section_builder.hpp in Headers */,
 				675340711A3F2A7400A0A8C3 /* feature_sorter.hpp in Headers */,
 				34F5588A1DBF4C9600A4FC11 /* sponsored_dataset_inl.hpp in Headers */,
 				67C79BB61E2CEEAB00C40034 /* traffic_generator.hpp in Headers */,
@@ -540,6 +547,7 @@
 				6753406C1A3F2A7400A0A8C3 /* feature_generator.cpp in Sources */,
 				67C79BB51E2CEEAB00C40034 /* traffic_generator.cpp in Sources */,
 				0C5FEC701DDE19E50017688C /* routing_index_generator.cpp in Sources */,
+				3D74EF071F86841C0081202C /* ugc_section_builder.cpp in Sources */,
 				67C79BB11E2CEEAB00C40034 /* restriction_generator.cpp in Sources */,
 				3D51BC521D5E512500F1FA8D /* altitude_generator.cpp in Sources */,
 				670E7BB31EF9812B00A8E9ED /* metalines_builder.cpp in Sources */,
diff --git a/xcode/ugc/ugc.xcodeproj/project.pbxproj b/xcode/ugc/ugc.xcodeproj/project.pbxproj
index 03b7907b95..263b954aee 100644
--- a/xcode/ugc/ugc.xcodeproj/project.pbxproj
+++ b/xcode/ugc/ugc.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3D74EF041F86840C0081202C /* loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF021F86840C0081202C /* loader.cpp */; };
+		3D74EF1E1F8B94EA0081202C /* serdes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D74EF1A1F8B90B00081202C /* serdes.cpp */; };
 		670E7B981EF97D1000A8E9ED /* serdes_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E7B941EF97CE700A8E9ED /* serdes_tests.cpp */; };
 		670E7B991EF97D1600A8E9ED /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E7B961EF97D0E00A8E9ED /* testingmain.cpp */; };
 		670E7B9B1EF9803C00A8E9ED /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 670E7B9A1EF9803C00A8E9ED /* libbase.a */; };
@@ -34,6 +36,14 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		3D74EF021F86840C0081202C /* loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loader.cpp; sourceTree = "<group>"; };
+		3D74EF031F86840C0081202C /* loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = loader.hpp; sourceTree = "<group>"; };
+		3D74EF181F8B90B00081202C /* header_v0.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = header_v0.hpp; sourceTree = "<group>"; };
+		3D74EF191F8B90B00081202C /* index_ugc.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = index_ugc.hpp; sourceTree = "<group>"; };
+		3D74EF1A1F8B90B00081202C /* serdes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = serdes.cpp; sourceTree = "<group>"; };
+		3D74EF1B1F8B90B00081202C /* serdes.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = serdes.hpp; sourceTree = "<group>"; };
+		3D74EF1C1F8B90B00081202C /* ugc_holder.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ugc_holder.hpp; sourceTree = "<group>"; };
+		3D74EF1D1F8B90B00081202C /* visitors.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = visitors.hpp; sourceTree = "<group>"; };
 		670E7B7C1EF97C1000A8E9ED /* ugc_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ugc_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		670E7B941EF97CE700A8E9ED /* serdes_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_tests.cpp; sourceTree = "<group>"; };
 		670E7B961EF97D0E00A8E9ED /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
@@ -82,6 +92,19 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		3D74EF171F8B90B00081202C /* binary */ = {
+			isa = PBXGroup;
+			children = (
+				3D74EF181F8B90B00081202C /* header_v0.hpp */,
+				3D74EF191F8B90B00081202C /* index_ugc.hpp */,
+				3D74EF1A1F8B90B00081202C /* serdes.cpp */,
+				3D74EF1B1F8B90B00081202C /* serdes.hpp */,
+				3D74EF1C1F8B90B00081202C /* ugc_holder.hpp */,
+				3D74EF1D1F8B90B00081202C /* visitors.hpp */,
+			);
+			path = binary;
+			sourceTree = "<group>";
+		};
 		670E7B931EF97CBA00A8E9ED /* ugc_tests */ = {
 			isa = PBXGroup;
 			children = (
@@ -116,6 +139,9 @@
 		F6F8E3A61EF83D7600F2DE8F /* ugc */ = {
 			isa = PBXGroup;
 			children = (
+				3D74EF171F8B90B00081202C /* binary */,
+				3D74EF021F86840C0081202C /* loader.cpp */,
+				3D74EF031F86840C0081202C /* loader.hpp */,
 				F6150E5B1EFAAB45000B955D /* storage.cpp */,
 				F6150E5C1EFAAB45000B955D /* storage.hpp */,
 				F6150E1F1EF90040000B955D /* api.cpp */,
@@ -242,6 +268,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				F6150E221EF90040000B955D /* api.cpp in Sources */,
+				3D74EF1E1F8B94EA0081202C /* serdes.cpp in Sources */,
+				3D74EF041F86840C0081202C /* loader.cpp in Sources */,
 				F6150E5D1EFAAB45000B955D /* storage.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;