diff --git a/android/jni/com/mapswithme/country/ActiveCountryTree.cpp b/android/jni/com/mapswithme/country/ActiveCountryTree.cpp
index 29d88c3231..b0a3a87309 100644
--- a/android/jni/com/mapswithme/country/ActiveCountryTree.cpp
+++ b/android/jni/com/mapswithme/country/ActiveCountryTree.cpp
@@ -146,19 +146,15 @@ extern "C"
     GetMapLayout().DownloadMap(storage::ToNative(index), ToOptions(options));
   }
 
-  // FIXME (trashkalmar): Include proper logic
-
-  static bool legacy_mode = true;
-
   JNIEXPORT jboolean JNICALL
   Java_com_mapswithme_country_ActiveCountryTree_isLegacyMode(JNIEnv * env, jclass clazz)
   {
-    return legacy_mode;
+    return g_framework->NeedMigrate();
   }
 
   JNIEXPORT void JNICALL
   Java_com_mapswithme_country_ActiveCountryTree_migrate(JNIEnv * env, jclass clazz)
   {
-    legacy_mode = false;
+    g_framework->Migrate();
   }
 }
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 430ebfd678..6faf5d46d7 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -542,11 +542,20 @@ void Framework::SetActiveUserMark(UserMark const * mark)
   m_activeUserMark = mark;
 }
 
+bool Framework::NeedMigrate()
+{
+  return platform::migrate::NeedMigrate();
+}
+
+void Framework::Migrate()
+{
+  m_work.Migrate();
+}
+
 UserMark const * Framework::GetActiveUserMark()
 {
   return m_activeUserMark;
 }
-
 } // namespace android
 
 //============ GLUE CODE for com.mapswithme.maps.Framework class =============//
diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp
index cb08400053..701b1f60d8 100644
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@@ -169,6 +169,9 @@ namespace android
     void SetActiveUserMark(UserMark const * mark);
     UserMark const * GetActiveUserMark();
 
+    bool NeedMigrate();
+    void Migrate();
+
   public:
     virtual void ItemStatusChanged(int childPosition);
     virtual void ItemProgressChanged(int childPosition, storage::LocalAndRemoteSizeT const & sizes);