diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp
index bf9b32163f..fbc49db1f4 100644
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@@ -1,7 +1,6 @@
 #include "drape_frontend/apply_feature_functors.hpp"
 #include "drape_frontend/shape_view_params.hpp"
 #include "drape_frontend/visual_params.hpp"
-#include "drape_frontend/engine_context.hpp"
 
 #include "drape_frontend/area_shape.hpp"
 #include "drape_frontend/line_shape.hpp"
@@ -186,9 +185,9 @@ m2::PointF GetOffset(CaptionDefProto const * capRule)
 
 } // namespace
 
-BaseApplyFeature::BaseApplyFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+BaseApplyFeature::BaseApplyFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                                    CaptionDescription const & caption)
-  : m_context(context)
+  : m_drawer(drawer)
   , m_id(id)
   , m_captions(caption)
 {
@@ -221,9 +220,9 @@ void BaseApplyFeature::ExtractCaptionParams(CaptionDefProto const * primaryProto
 
 // ============================================= //
 
-ApplyPointFeature::ApplyPointFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+ApplyPointFeature::ApplyPointFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                                      CaptionDescription const & captions)
-  : TBase(context, id, captions)
+  : TBase(drawer, id, captions)
   , m_hasPoint(false)
   , m_symbolDepth(dp::minDepth)
   , m_circleDepth(dp::minDepth)
@@ -252,7 +251,7 @@ void ApplyPointFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
     TextViewParams params;
     ExtractCaptionParams(capRule, pRule->GetCaption(1), depth, params);
     if(!params.m_primaryText.empty() || !params.m_secondaryText.empty())
-      m_context->InsertShape(make_unique_dp<TextShape>(m_centerPoint, params));
+      m_drawer->InsertShape(make_unique_dp<TextShape>(m_centerPoint, params));
   }
 
   SymbolRuleProto const * symRule =  pRule->GetSymbol();
@@ -282,22 +281,22 @@ void ApplyPointFeature::Finish()
     params.m_depth = m_circleDepth;
     params.m_color = ToDrapeColor(m_circleRule->color());
     params.m_radius = m_circleRule->radius();
-    m_context->InsertShape(make_unique_dp<CircleShape>(m_centerPoint, params));
+    m_drawer->InsertShape(make_unique_dp<CircleShape>(m_centerPoint, params));
   }
   else if (m_symbolRule)
   {
     PoiSymbolViewParams params(m_id);
     params.m_depth = m_symbolDepth;
     params.m_symbolName = m_symbolRule->name();
-    m_context->InsertShape(make_unique_dp<PoiSymbolShape>(m_centerPoint, params));
+    m_drawer->InsertShape(make_unique_dp<PoiSymbolShape>(m_centerPoint, params));
   }
 }
 
 // ============================================= //
 
-ApplyAreaFeature::ApplyAreaFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+ApplyAreaFeature::ApplyAreaFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                                    CaptionDescription const & captions)
-  : TBase(context, id, captions)
+  : TBase(drawer, id, captions)
 {
 }
 
@@ -327,7 +326,7 @@ void ApplyAreaFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
     AreaViewParams params;
     params.m_depth = depth;
     params.m_color = ToDrapeColor(areaRule->color());
-    m_context->InsertShape(make_unique_dp<AreaShape>(move(m_triangles), params));
+    m_drawer->InsertShape(make_unique_dp<AreaShape>(move(m_triangles), params));
   }
   else
     TBase::ProcessRule(rule);
@@ -335,13 +334,13 @@ void ApplyAreaFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
 
 // ============================================= //
 
-ApplyLineFeature::ApplyLineFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+ApplyLineFeature::ApplyLineFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                                    CaptionDescription const & captions,
-                                   double currentScaleGtoP, bool simplify)
-  : TBase(context, id, captions)
+                                   double currentScaleGtoP, size_t pointsCount)
+  : TBase(drawer, id, captions)
   , m_currentScaleGtoP(currentScaleGtoP)
   , m_sqrScale(math::sqr(m_currentScaleGtoP))
-  , m_simplify(simplify)
+  , m_initialPointsCount(pointsCount)
 #ifdef CALC_FILTERED_POINTS
   , m_readedCount(0)
 #endif
@@ -355,7 +354,7 @@ void ApplyLineFeature::operator() (m2::PointD const & point)
 #endif
 
   if (m_spline.IsNull())
-    m_spline.Reset(new m2::Spline());
+    m_spline.Reset(new m2::Spline(m_initialPointsCount));
 
   if (m_spline->IsEmpty())
   {
@@ -409,7 +408,7 @@ void ApplyLineFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
     params.m_textFont = fontDecl;
     params.m_baseGtoPScale = m_currentScaleGtoP;
 
-    m_context->InsertShape(make_unique_dp<PathTextShape>(m_spline, params));
+    m_drawer->InsertShape(make_unique_dp<PathTextShape>(m_spline, params));
   }
 
   if (pLineRule != NULL)
@@ -425,7 +424,7 @@ void ApplyLineFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
       params.m_step = symRule.step() * mainScale;
       params.m_baseGtoPScale = m_currentScaleGtoP;
 
-      m_context->InsertShape(make_unique_dp<PathSymbolShape>(m_spline, params));
+      m_drawer->InsertShape(make_unique_dp<PathSymbolShape>(m_spline, params));
     }
     else
     {
@@ -433,7 +432,7 @@ void ApplyLineFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
       Extract(pLineRule, params);
       params.m_depth = depth;
       params.m_baseGtoPScale = m_currentScaleGtoP;
-      m_context->InsertShape(make_unique_dp<LineShape>(m_spline, params));
+      m_drawer->InsertShape(make_unique_dp<LineShape>(m_spline, params));
     }
   }
 }
@@ -470,7 +469,7 @@ void ApplyLineFeature::Finish()
     m2::Spline::iterator it = m_spline.CreateIterator();
     while (!it.BeginAgain())
     {
-      m_context->InsertShape(make_unique_dp<TextShape>(it.m_pos, viewParams));
+      m_drawer->InsertShape(make_unique_dp<TextShape>(it.m_pos, viewParams));
       it.Advance(splineStep);
     }
   }
diff --git a/drape_frontend/apply_feature_functors.hpp b/drape_frontend/apply_feature_functors.hpp
index bb82d4d760..8f4028e4c3 100644
--- a/drape_frontend/apply_feature_functors.hpp
+++ b/drape_frontend/apply_feature_functors.hpp
@@ -20,12 +20,12 @@ namespace df
 {
 
 struct TextViewParams;
-class EngineContext;
+class RuleDrawer;
 
 class BaseApplyFeature
 {
 public:
-  BaseApplyFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+  BaseApplyFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                    CaptionDescription const & captions);
 
   virtual ~BaseApplyFeature() {}
@@ -36,7 +36,7 @@ protected:
                             double depth,
                             TextViewParams & params) const;
 
-  ref_ptr<EngineContext> m_context;
+  ref_ptr<RuleDrawer> m_drawer;
   FeatureID m_id;
   CaptionDescription const & m_captions;
 };
@@ -45,7 +45,7 @@ class ApplyPointFeature : public BaseApplyFeature
 {
   typedef BaseApplyFeature TBase;
 public:
-  ApplyPointFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+  ApplyPointFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                     CaptionDescription const & captions);
 
   void operator()(m2::PointD const & point);
@@ -65,7 +65,7 @@ class ApplyAreaFeature : public ApplyPointFeature
 {
   typedef ApplyPointFeature TBase;
 public:
-  ApplyAreaFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+  ApplyAreaFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                    CaptionDescription const & captions);
 
   using TBase::operator ();
@@ -81,9 +81,9 @@ class ApplyLineFeature : public BaseApplyFeature
 {
   typedef BaseApplyFeature TBase;
 public:
-  ApplyLineFeature(ref_ptr<EngineContext> context, FeatureID const & id,
+  ApplyLineFeature(ref_ptr<RuleDrawer> drawer, FeatureID const & id,
                    CaptionDescription const & captions,
-                   double currentScaleGtoP, bool simplify);
+                   double currentScaleGtoP, bool simplify, size_t pointsCount);
 
   void operator() (m2::PointD const & point);
   bool HasGeometry() const;
@@ -96,6 +96,7 @@ private:
   double m_sqrScale;
   m2::PointD m_lastAddedPoint;
   bool m_simplify;
+  size_t m_initialPointsCount;
 
 #ifdef CALC_FILTERED_POINTS
   int m_readedCount;
diff --git a/drape_frontend/engine_context.cpp b/drape_frontend/engine_context.cpp
index 67b29e8aaa..7d5fc8cd62 100644
--- a/drape_frontend/engine_context.cpp
+++ b/drape_frontend/engine_context.cpp
@@ -24,16 +24,9 @@ void EngineContext::BeginReadTile()
   PostMessage(make_unique_dp<TileReadStartMessage>(m_tileKey));
 }
 
-void EngineContext::InsertShape(drape_ptr<MapShape> && shape)
+void EngineContext::Flush(list<drape_ptr<MapShape>> && shapes)
 {
-  lock_guard<mutex> lock(m_mutex);
-  m_mapShapes.push_back(move(shape));
-}
-
-void EngineContext::Flush()
-{
-  lock_guard<mutex> lock(m_mutex);
-  PostMessage(make_unique_dp<MapShapeReadedMessage>(m_tileKey, move(m_mapShapes)));
+  PostMessage(make_unique_dp<MapShapeReadedMessage>(m_tileKey, move(shapes)));
 }
 
 void EngineContext::EndReadTile()
@@ -67,9 +60,10 @@ void EngineContext::EndReadTile()
 
   tp.m_primaryTextFont = dp::FontDecl(dp::Color::Red(), 30);
 
-  InsertShape(make_unique_dp<TextShape>(r.Center(), tp));
+  list<drape_ptr<MapShape>> shapes;
+  shapes.push_back(make_unique_dp<TextShape>(r.Center(), tp));
 
-  Flush();
+  Flush(move(shapes));
 #endif
 
   PostMessage(make_unique_dp<TileReadEndMessage>(m_tileKey));
diff --git a/drape_frontend/engine_context.hpp b/drape_frontend/engine_context.hpp
index eda0fd6c76..b16b0a7dba 100644
--- a/drape_frontend/engine_context.hpp
+++ b/drape_frontend/engine_context.hpp
@@ -19,21 +19,14 @@ public:
   TileKey const & GetTileKey() const { return m_tileKey; }
 
   void BeginReadTile();
-  /// If you call this method, you may forget about shape.
-  /// It will be proccessed and delete later
-  void InsertShape(drape_ptr<MapShape> && shape);
-  void Flush();
+  void Flush(list<drape_ptr<MapShape>> && shapes);
   void EndReadTile();
 
 private:
   void PostMessage(drape_ptr<Message> && message);
 
-private:
   TileKey m_tileKey;
   ref_ptr<ThreadsCommutator> m_commutator;
-
-  mutex m_mutex;
-  list<drape_ptr<MapShape>> m_mapShapes;
 };
 
 } // namespace df
diff --git a/drape_frontend/rule_drawer.cpp b/drape_frontend/rule_drawer.cpp
index 479ebaa087..8d5287cbbd 100644
--- a/drape_frontend/rule_drawer.cpp
+++ b/drape_frontend/rule_drawer.cpp
@@ -28,6 +28,11 @@ RuleDrawer::RuleDrawer(TDrawerCallback const & fn, ref_ptr<EngineContext> contex
   m_currentScaleGtoP = 1.0f / m_geometryConvertor.GetScale();
 }
 
+void RuleDrawer::InsertShape(drape_ptr<MapShape> && shape)
+{
+  m_mapShapes.push_back(move(shape));
+}
+
 void RuleDrawer::operator()(FeatureType const & f)
 {
   Stylist s;
@@ -53,7 +58,7 @@ void RuleDrawer::operator()(FeatureType const & f)
 
   if (s.AreaStyleExists())
   {
-    ApplyAreaFeature apply(m_context, f.GetID(), s.GetCaptionDescription());
+    ApplyAreaFeature apply(make_ref(this), f.GetID(), s.GetCaptionDescription());
     f.ForEachTriangleRef(apply, zoomLevel);
 
     if (s.PointStyleExists())
@@ -65,7 +70,7 @@ void RuleDrawer::operator()(FeatureType const & f)
   else if (s.LineStyleExists())
   {
     ApplyLineFeature apply(m_context, f.GetID(), s.GetCaptionDescription(),
-                           m_currentScaleGtoP, zoomLevel >= SIMPLIFY_BOTTOM && zoomLevel <= SIMPLIFY_TOP);
+                           m_currentScaleGtoP, zoomLevel >= SIMPLIFY_BOTTOM && zoomLevel <= SIMPLIFY_TOP, f.GetPointsCount());
     f.ForEachPointRef(apply, zoomLevel);
 
     if (apply.HasGeometry())
@@ -75,14 +80,14 @@ void RuleDrawer::operator()(FeatureType const & f)
   else
   {
     ASSERT(s.PointStyleExists(), ());
-    ApplyPointFeature apply(m_context, f.GetID(), s.GetCaptionDescription());
+    ApplyPointFeature apply(make_ref(this), f.GetID(), s.GetCaptionDescription());
     f.ForEachPointRef(apply, zoomLevel);
 
     s.ForEachRule(bind(&ApplyPointFeature::ProcessRule, &apply, _1));
     apply.Finish();
   }
 
-  m_context->Flush();
+  m_context->Flush(move(m_mapShapes));
 }
 
 } // namespace df
diff --git a/drape_frontend/rule_drawer.hpp b/drape_frontend/rule_drawer.hpp
index 591bb33776..de6fa1df0a 100644
--- a/drape_frontend/rule_drawer.hpp
+++ b/drape_frontend/rule_drawer.hpp
@@ -18,6 +18,7 @@ namespace df
 
 class EngineContext;
 class Stylist;
+class MapShape;
 
 class RuleDrawer
 {
@@ -26,6 +27,8 @@ public:
   RuleDrawer(TDrawerCallback const & fn,
              ref_ptr<EngineContext> context);
 
+  void InsertShape(drape_ptr<MapShape> && shape);
+
   void operator() (FeatureType const & f);
 
 private:
@@ -35,6 +38,8 @@ private:
   ScreenBase m_geometryConvertor;
   double m_currentScaleGtoP;
   set<string> m_coastlines;
+
+  list<drape_ptr<MapShape>> m_mapShapes;
 };
 
 } // namespace dfo
diff --git a/geometry/spline.cpp b/geometry/spline.cpp
index 71c729ddc7..e24d8c8b03 100644
--- a/geometry/spline.cpp
+++ b/geometry/spline.cpp
@@ -23,6 +23,13 @@ Spline::Spline(vector<PointD> const & path)
   }
 }
 
+Spline::Spline(size_t reservedSize)
+{
+  m_position.reserve(reservedSize);
+  m_direction.reserve(reservedSize);
+  m_length.reserve(reservedSize);
+}
+
 void Spline::AddPoint(PointD const & pt)
 {
   /// TODO remove this check when fix generator.
diff --git a/geometry/spline.hpp b/geometry/spline.hpp
index 9af7097e9d..33d8a01567 100644
--- a/geometry/spline.hpp
+++ b/geometry/spline.hpp
@@ -45,6 +45,7 @@ public:
 
 public:
   Spline() {}
+  Spline(size_t reservedSize);
   Spline(vector<PointD> const & path);
   Spline const & operator = (Spline const & spl);