diff --git a/.swiftlint.yml b/.swiftlint.yml
index 93c0098e77..ea177e1efc 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -90,7 +90,6 @@ whitelist_rules:
   - nesting
   - nimble_operator
   - no_space_in_method_call
-  - notification_center_detachment
   - nslocalizedstring_key
   - nsobject_prefer_isequal
   - number_separator
diff --git a/Gemfile b/Gemfile
index 089ad932c5..a442f92d2b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 ruby "2.6.5"
 
-gem "fastlane", "2.148.1"
-gem "cocoapods", "1.9.1"
+gem "fastlane", "2.149.1"
+gem "cocoapods", "1.9.3"
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index 23448c11bc..5802a83e20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,32 +9,32 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.2)
+    algoliasearch (1.27.3)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.318.0)
-    aws-sdk-core (3.96.1)
+    aws-partitions (1.324.0)
+    aws-sdk-core (3.97.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.31.0)
+    aws-sdk-kms (1.33.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.65.0)
+    aws-sdk-s3 (1.67.1)
       aws-sdk-core (~> 3, >= 3.96.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.3)
+    aws-sigv4 (1.1.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
     babosa (1.0.3)
     claide (1.0.3)
-    cocoapods (1.9.1)
+    cocoapods (1.9.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.1)
+      cocoapods-core (= 1.9.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -50,7 +50,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.1)
+    cocoapods-core (1.9.3)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -92,7 +92,7 @@ GEM
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.1.7)
-    fastlane (2.148.1)
+    fastlane (2.149.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
@@ -131,7 +131,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-firebase_app_distribution (0.1.4)
-    ffi (1.12.2)
+    ffi (1.13.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -146,10 +146,10 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.1)
+    google-cloud-env (1.3.2)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.0)
-    google-cloud-storage (1.26.1)
+    google-cloud-errors (1.0.1)
+    google-cloud-storage (1.26.2)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
@@ -210,7 +210,7 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     tty-cursor (0.7.1)
-    tty-screen (0.7.1)
+    tty-screen (0.8.0)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
@@ -238,8 +238,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.9.1)
-  fastlane (= 2.148.1)
+  cocoapods (= 1.9.3)
+  fastlane (= 2.149.1)
   fastlane-plugin-firebase_app_distribution
 
 RUBY VERSION
diff --git a/Podfile b/Podfile
index 35bbab9d6a..adf33bcfb4 100644
--- a/Podfile
+++ b/Podfile
@@ -5,7 +5,7 @@ inhibit_all_warnings!
 use_frameworks!
 
 def shared_pods
-    pod 'Alamofire', '5.2.0'
+    pod 'Alamofire', '5.2.1'
     pod 'Atributika', '4.9.7'
     pod 'SwiftyJSON', '5.0.0'
     pod 'SDWebImage', '5.7.4'
@@ -60,7 +60,7 @@ def all_pods
     pod 'Charts', '3.4.0'
     pod 'EasyTipView', '2.0.4'
     pod 'ActionSheetPicker-3.0', '2.4.0'
-    pod 'Nuke', '8.4.1'
+    pod 'Nuke', '9.1.0'
     pod 'STRegex', '2.1.1'
     pod 'Tabman', '2.8.0'
     pod 'SwiftDate', '6.1.0'
diff --git a/Podfile.lock b/Podfile.lock
index d24fc7695b..08cb8dcdbe 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - ActionSheetPicker-3.0 (2.4.0)
   - Agrume (5.6.8):
     - SwiftyGif
-  - Alamofire (5.2.0)
+  - Alamofire (5.2.1)
   - Amplitude-iOS (4.9.3)
   - Atributika (4.9.7)
   - BEMCheckBox (1.4.1)
@@ -154,7 +154,7 @@ PODS:
   - nanopb/decode (1.30905.0)
   - nanopb/encode (1.30905.0)
   - Nimble (8.0.9)
-  - Nuke (8.4.1)
+  - Nuke (9.1.0)
   - Pageboy (3.5.1)
   - pop (1.0.12)
   - Presentr (1.9)
@@ -201,7 +201,7 @@ PODS:
 DEPENDENCIES:
   - ActionSheetPicker-3.0 (= 2.4.0)
   - Agrume (= 5.6.8)
-  - Alamofire (= 5.2.0)
+  - Alamofire (= 5.2.1)
   - Amplitude-iOS (= 4.9.3)
   - Atributika (= 4.9.7)
   - BEMCheckBox (= 1.4.1)
@@ -225,7 +225,7 @@ DEPENDENCIES:
   - lottie-ios (= 2.5.3)
   - Mockingjay (= 3.0.0-alpha.1)
   - Nimble (= 8.0.9)
-  - Nuke (= 8.4.1)
+  - Nuke (= 9.1.0)
   - Presentr (= 1.9)
   - PromiseKit (= 6.13.0)
   - Quick (= 2.2.0)
@@ -329,7 +329,7 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   ActionSheetPicker-3.0: c68e1f8355828b4e1c823fa87185aacfef5e6fe3
   Agrume: 53c2be9b06caef4b4996a2886a56b9e901bcc6c0
-  Alamofire: c1ca147559e730bfb2182c8c7aafbdd90a867987
+  Alamofire: e911732990610fe89af59ac0077f923d72dc3dfd
   Amplitude-iOS: 122e026c44db8460e5efcf84859aa290a0ae9786
   Atributika: 6428744f0405ebe79220397a3cb4a9c9d19d5c46
   BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
@@ -367,7 +367,7 @@ SPEC CHECKSUMS:
   Mockingjay: 0f7c5aa49c7f1b95621cee3c79b557141f5a225c
   nanopb: c43f40fadfe79e8b8db116583945847910cbabc9
   Nimble: 98b888285a615fd34f20e61753cf58ea1402bde4
-  Nuke: d780e3507a86b86c589ab3cc5cd302d5456f06fb
+  Nuke: c97bf6006d31687cfa7c28507305143de27a4aa1
   Pageboy: 288353d4cc848c24deec2f7542f325089247c136
   pop: d582054913807fd11fd50bfe6a539d91c7e1a55a
   Presentr: 7078d7eb5d1661ebeaae60c9e42a1e534de1b993
@@ -393,6 +393,6 @@ SPEC CHECKSUMS:
   VK-ios-sdk: 62a10b6571fbcda0657f455fedce7fedf55b4cd0
   YandexMobileMetrica: 1030df2959c886a7be3bc3d274eb54c8e86afd6f
 
-PODFILE CHECKSUM: 589e7730aaf5f88b6eb827b904adee58229b0540
+PODFILE CHECKSUM: 96d90dd536d857d0a4b714653fdb527c9a657d38
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3
diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
index 5718bf042d..fc38d740ca 100644
--- a/Stepic.xcodeproj/project.pbxproj
+++ b/Stepic.xcodeproj/project.pbxproj
@@ -382,6 +382,7 @@
 		2C1219901F9655AB00A43E98 /* NotificationsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C12198F1F9655AB00A43E98 /* NotificationsSection.swift */; };
 		2C15EB961FC70A0300F56D93 /* UICollectionViewFlowLayout+PlusCrashWorkaround.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C15EB951FC70A0300F56D93 /* UICollectionViewFlowLayout+PlusCrashWorkaround.swift */; };
 		2C16495922C10DD400DF18CA /* UserActivitiesNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C16495822C10DD300DF18CA /* UserActivitiesNetworkService.swift */; };
+		2C16A88F248F98C9001E5CBD /* UserCoursesPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C16A88E248F98C9001E5CBD /* UserCoursesPersistenceService.swift */; };
 		2C16ED3523D0BC620017C113 /* SettingsRightDetailCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C16ED3423D0BC620017C113 /* SettingsRightDetailCellView.swift */; };
 		2C18AD4D23D5F76E00FD89F3 /* DownloadingServiceFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C18AD4C23D5F76E00FD89F3 /* DownloadingServiceFactory.swift */; };
 		2C1A4D93244F8A1500D0F2DF /* ARKit-Badge-Glyph-Only.png in Resources */ = {isa = PBXBuildFile; fileRef = 2C1A4D92244F8A1500D0F2DF /* ARKit-Badge-Glyph-Only.png */; };
@@ -416,6 +417,7 @@
 		2C2485472101D91F006F8858 /* RestorableBackgroundDownloaderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2485462101D91F006F8858 /* RestorableBackgroundDownloaderProtocol.swift */; };
 		2C2485492101EE3E006F8858 /* DownloaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2485482101EE3E006F8858 /* DownloaderTests.swift */; };
 		2C26BF0A240810A3000EE23C /* AttemptsRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C26BF09240810A3000EE23C /* AttemptsRepository.swift */; };
+		2C273266248BB60500BD065F /* DownloadsDeletionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C273265248BB60500BD065F /* DownloadsDeletionService.swift */; };
 		2C284DB92474418600669736 /* CoursePaymentsAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C284DB82474418600669736 /* CoursePaymentsAPI.swift */; };
 		2C284DBB247444DF00669736 /* CoursePaymentsNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C284DBA247444DF00669736 /* CoursePaymentsNetworkService.swift */; };
 		2C295A6A222D8BAB008878B6 /* EnrollmentsAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C8CB0E21FB48F39008CB1AC /* EnrollmentsAPI.swift */; };
@@ -526,6 +528,7 @@
 		2C92669820B5C7CF00525AFC /* PlaceholderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C92669620B5C7CF00525AFC /* PlaceholderTableViewCell.xib */; };
 		2C936D45243D3ADB00A4A4A9 /* ApplicationThemeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C936D44243D3ADB00A4A4A9 /* ApplicationThemeService.swift */; };
 		2C936D47243D3FCE00A4A4A9 /* ApplicationTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C936D46243D3FCE00A4A4A9 /* ApplicationTheme.swift */; };
+		2C94C7FA248F86C900E4104E /* UserCourse+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C94C7F9248F86C900E4104E /* UserCourse+CoreDataProperties.swift */; };
 		2C96E11624192ACB005EDE2B /* UIColor+DynamicColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C96E11524192ACB005EDE2B /* UIColor+DynamicColor.swift */; };
 		2C9776EA24222AED0097AEFC /* UIView+TraitCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9776E924222AED0097AEFC /* UIView+TraitCollection.swift */; };
 		2C97E008215E47D8005684A1 /* SearchResultsPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08C1BF271FB9ED01008F342F /* SearchResultsPresenter.swift */; };
@@ -540,6 +543,8 @@
 		2C98B6B61FDFD74C005AB72C /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C98B6B51FDFD74C005AB72C /* OnboardingViewController.swift */; };
 		2C998AD0246EC83800AAFDE4 /* NotificationAlertsAnalytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C998ACF246EC83800AAFDE4 /* NotificationAlertsAnalytics.swift */; };
 		2C9A8D2E22D348A5009434DB /* String+HTMLEscape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9A8D2D22D348A5009434DB /* String+HTMLEscape.swift */; };
+		2C9BBE4124903AB500FFED49 /* UserCoursesObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9BBE4024903AB500FFED49 /* UserCoursesObserver.swift */; };
+		2C9BBE432490462C00FFED49 /* Debouncer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9BBE422490462C00FFED49 /* Debouncer.swift */; };
 		2C9BD78E1FC43C6B00F89CBE /* NotificationsBadgesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9BD78D1FC43C6B00F89CBE /* NotificationsBadgesManager.swift */; };
 		2C9E3F3C1F7A80A300DDF1AA /* Notification+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9E3F3B1F7A80A300DDF1AA /* Notification+CoreDataProperties.swift */; };
 		2C9E3F3E1F7A930100DDF1AA /* NotificationsAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C9E3F3D1F7A930100DDF1AA /* NotificationsAPI.swift */; };
@@ -549,6 +554,7 @@
 		2CA255371F8CD62C00C58048 /* NotificationStatusButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA255361F8CD62B00C58048 /* NotificationStatusButton.swift */; };
 		2CA3DAA12179C6F600F43888 /* NotificationsRegistrationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA3DAA02179C6F600F43888 /* NotificationsRegistrationService.swift */; };
 		2CA3DAA32179C71500F43888 /* NotificationPermissionStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA3DAA22179C71500F43888 /* NotificationPermissionStatus.swift */; };
+		2CA47D4A248ABF0E00925335 /* LogoutDataClearService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA47D49248ABF0E00925335 /* LogoutDataClearService.swift */; };
 		2CA9D97720109718007AA743 /* AdaptiveStatsPagerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA9D97620109718007AA743 /* AdaptiveStatsPagerViewController.swift */; };
 		2CA9D97920109727007AA743 /* AdaptiveStatsPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA9D97820109727007AA743 /* AdaptiveStatsPresenter.swift */; };
 		2CA9D97D20109C07007AA743 /* AdaptiveRatingsPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA9D97C20109C07007AA743 /* AdaptiveRatingsPresenter.swift */; };
@@ -574,6 +580,7 @@
 		2CB2740422C515050078CA2F /* QuizElementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB2740322C515050078CA2F /* QuizElementView.swift */; };
 		2CB3563E2476CB7B00E59A03 /* MagicLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB3563D2476CB7B00E59A03 /* MagicLink.swift */; };
 		2CB37E6623902BB80050D85E /* StorageUsageService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB37E6523902BB80050D85E /* StorageUsageService.swift */; };
+		2CB510EE248C226A00DB8344 /* VideosPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB510ED248C226A00DB8344 /* VideosPersistenceService.swift */; };
 		2CB51F6B204FC6220008431C /* UserActivitySpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB51F6A204FC6220008431C /* UserActivitySpec.swift */; };
 		2CB62BDB2019ECB800B5E336 /* OnboardingCardStepViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB62BDA2019ECB800B5E336 /* OnboardingCardStepViewController.swift */; };
 		2CB62BE42019FD8500B5E336 /* step3.html in Resources */ = {isa = PBXBuildFile; fileRef = 2CB62BDC2019FD8400B5E336 /* step3.html */; };
@@ -656,6 +663,11 @@
 		2CE8391120C8101500FE3672 /* AchievementBadgeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2CE8391020C8101500FE3672 /* AchievementBadgeView.xib */; };
 		2CE8391320C8102300FE3672 /* AchievementBadgeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE8391220C8102200FE3672 /* AchievementBadgeView.swift */; };
 		2CE8BA9B23D631E500C2EED9 /* ImageStoredFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE8BA9A23D631E500C2EED9 /* ImageStoredFileManager.swift */; };
+		2CE9BF44248D07D0004F6659 /* CodeTemplatesPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE9BF43248D07D0004F6659 /* CodeTemplatesPersistenceService.swift */; };
+		2CE9BF46248D08A8004F6659 /* CodeSamplesPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE9BF45248D08A8004F6659 /* CodeSamplesPersistenceService.swift */; };
+		2CE9BF48248D0950004F6659 /* CodeLimitsPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE9BF47248D0950004F6659 /* CodeLimitsPersistenceService.swift */; };
+		2CE9BF4A248D09FC004F6659 /* BlocksPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE9BF49248D09FC004F6659 /* BlocksPersistenceService.swift */; };
+		2CE9BF4C248D0EC5004F6659 /* VideoURLsPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE9BF4B248D0EC5004F6659 /* VideoURLsPersistenceService.swift */; };
 		2CEBEBF2242F8E9900DBFDF0 /* StepikRequestInterceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CEBEBF1242F8E9900DBFDF0 /* StepikRequestInterceptor.swift */; };
 		2CEBEBF4242F8F9900DBFDF0 /* StepikRequestAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CEBEBF3242F8F9900DBFDF0 /* StepikRequestAdapter.swift */; };
 		2CEBEBF6242F8FB200DBFDF0 /* StepikRequestRetrier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CEBEBF5242F8FB200DBFDF0 /* StepikRequestRetrier.swift */; };
@@ -857,6 +869,7 @@
 		62E986489D7AC8CBDB0C34B8 /* ExploreSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98101487588BB70A5C1A7 /* ExploreSearchBar.swift */; };
 		62E98652FAF20DE91530C26A /* CourseListInputProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98F7A42A576AE87588589 /* CourseListInputProtocol.swift */; };
 		62E9866A0079204B9AD0AFEA /* TagsPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98351E02F89F112A8EDD2 /* TagsPresenter.swift */; };
+		62E98672DA4B29B46167B0A4 /* LastCodeLanguagePersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E989EE577036747B419AAC /* LastCodeLanguagePersistenceService.swift */; };
 		62E9867E94A2DD00EEE119E0 /* NewMatchingQuizAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9843AA3AFCC614ECC1450 /* NewMatchingQuizAssembly.swift */; };
 		62E9868F7C399B35356DD6E8 /* LessonProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E983EC489566F23F209BE7 /* LessonProvider.swift */; };
 		62E98691D21B40042DA6C1AB /* CodeQuizFullscreenRunCodeDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98390BA7859C78E2E9AAA /* CodeQuizFullscreenRunCodeDataFlow.swift */; };
@@ -873,6 +886,7 @@
 		62E987062AC5064918B27379 /* ContentLanguageSwitchAvailabilityService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9847B46C78DACD9B3EE72 /* ContentLanguageSwitchAvailabilityService.swift */; };
 		62E98706EE08B59BC5CB5B03 /* NewSortingQuizDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98C0502FE0C134B5CC718 /* NewSortingQuizDataFlow.swift */; };
 		62E98707AF0BEE9807661F4A /* CodeQuizViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9874159F84059DB95633E /* CodeQuizViewController.swift */; };
+		62E987084C26B24E039EA0A0 /* NotificationsPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98D6C6FA9C92ABDECEF12 /* NotificationsPersistenceService.swift */; };
 		62E9870A57333C471BCB4097 /* BaseQuizViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9889F89B997EFE5878073 /* BaseQuizViewModel.swift */; };
 		62E9870AFED7781931340685 /* ProfileDescriptionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98AFF3B8AC3CB8374445B /* ProfileDescriptionPresenter.swift */; };
 		62E9870EF451D397B27AB075 /* CourseInfoTabSyllabusCellStatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9857F9D81D94309D4D3A3 /* CourseInfoTabSyllabusCellStatsView.swift */; };
@@ -888,7 +902,9 @@
 		62E9874B2367F47B416932CF /* SolutionInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98D27662A96D3B8167A9E /* SolutionInteractor.swift */; };
 		62E9874D1EAE49639F81C916 /* URL+AppendQueryParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98F7C1643A576801B8D47 /* URL+AppendQueryParameters.swift */; };
 		62E987560B7A0EFE8D4753CB /* RetentionLocalNotificationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E9863EA3DABDA4ACF78273 /* RetentionLocalNotificationProvider.swift */; };
+		62E98778B1320381E97A0E1F /* LastStepPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98AC352F76C23F60E12A6 /* LastStepPersistenceService.swift */; };
 		62E98779C46941AA1F710191 /* ContinueCourseOutputProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98B7A07FDA68E6CA47ECB /* ContinueCourseOutputProtocol.swift */; };
+		62E9877F4784A8C707B4B712 /* CertificatesPersistenceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E983871207544AF21C27C6 /* CertificatesPersistenceService.swift */; };
 		62E98793982B530188C654BE /* UsersNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98407592112A22E967DE1 /* UsersNetworkService.swift */; };
 		62E987998151D191C16B5E15 /* ExploreAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98BE257BD24B6E46FD69D /* ExploreAssembly.swift */; };
 		62E987A5122564575E3B4852 /* CodeQuizFullscreenInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62E98C9C2AB31AEC2C3B53CE /* CodeQuizFullscreenInteractor.swift */; };
@@ -1626,6 +1642,7 @@
 		2C12198F1F9655AB00A43E98 /* NotificationsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsSection.swift; sourceTree = "<group>"; };
 		2C15EB951FC70A0300F56D93 /* UICollectionViewFlowLayout+PlusCrashWorkaround.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UICollectionViewFlowLayout+PlusCrashWorkaround.swift"; sourceTree = "<group>"; };
 		2C16495822C10DD300DF18CA /* UserActivitiesNetworkService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivitiesNetworkService.swift; sourceTree = "<group>"; };
+		2C16A88E248F98C9001E5CBD /* UserCoursesPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserCoursesPersistenceService.swift; sourceTree = "<group>"; };
 		2C16ED3423D0BC620017C113 /* SettingsRightDetailCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsRightDetailCellView.swift; sourceTree = "<group>"; };
 		2C18AD4C23D5F76E00FD89F3 /* DownloadingServiceFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadingServiceFactory.swift; sourceTree = "<group>"; };
 		2C19023B219F24B100FAD9AF /* Model_course_certificate_details_v28.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_course_certificate_details_v28.xcdatamodel; sourceTree = "<group>"; };
@@ -1662,6 +1679,7 @@
 		2C2485462101D91F006F8858 /* RestorableBackgroundDownloaderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestorableBackgroundDownloaderProtocol.swift; sourceTree = "<group>"; };
 		2C2485482101EE3E006F8858 /* DownloaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloaderTests.swift; sourceTree = "<group>"; };
 		2C26BF09240810A3000EE23C /* AttemptsRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttemptsRepository.swift; sourceTree = "<group>"; };
+		2C273265248BB60500BD065F /* DownloadsDeletionService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadsDeletionService.swift; sourceTree = "<group>"; };
 		2C284DB82474418600669736 /* CoursePaymentsAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoursePaymentsAPI.swift; sourceTree = "<group>"; };
 		2C284DBA247444DF00669736 /* CoursePaymentsNetworkService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoursePaymentsNetworkService.swift; sourceTree = "<group>"; };
 		2C2EA36A212D5FEF002116C9 /* StepikResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepikResult.swift; sourceTree = "<group>"; };
@@ -1788,11 +1806,15 @@
 		2C92669620B5C7CF00525AFC /* PlaceholderTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PlaceholderTableViewCell.xib; sourceTree = "<group>"; };
 		2C936D44243D3ADB00A4A4A9 /* ApplicationThemeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationThemeService.swift; sourceTree = "<group>"; };
 		2C936D46243D3FCE00A4A4A9 /* ApplicationTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationTheme.swift; sourceTree = "<group>"; };
+		2C94C7F7248F7E0F00E4104E /* Model_user_courses_v52.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_user_courses_v52.xcdatamodel; sourceTree = "<group>"; };
+		2C94C7F9248F86C900E4104E /* UserCourse+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserCourse+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		2C96E11524192ACB005EDE2B /* UIColor+DynamicColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+DynamicColor.swift"; sourceTree = "<group>"; };
 		2C9776E924222AED0097AEFC /* UIView+TraitCollection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+TraitCollection.swift"; sourceTree = "<group>"; };
 		2C98B6B51FDFD74C005AB72C /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
 		2C998ACF246EC83800AAFDE4 /* NotificationAlertsAnalytics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationAlertsAnalytics.swift; sourceTree = "<group>"; };
 		2C9A8D2D22D348A5009434DB /* String+HTMLEscape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+HTMLEscape.swift"; sourceTree = "<group>"; };
+		2C9BBE4024903AB500FFED49 /* UserCoursesObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserCoursesObserver.swift; sourceTree = "<group>"; };
+		2C9BBE422490462C00FFED49 /* Debouncer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debouncer.swift; sourceTree = "<group>"; };
 		2C9BD78D1FC43C6B00F89CBE /* NotificationsBadgesManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsBadgesManager.swift; sourceTree = "<group>"; };
 		2C9E3F351F7A79E600DDF1AA /* Model_notifications.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_notifications.xcdatamodel; sourceTree = "<group>"; };
 		2C9E3F3B1F7A80A300DDF1AA /* Notification+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Notification+CoreDataProperties.swift"; sourceTree = "<group>"; };
@@ -1804,6 +1826,7 @@
 		2CA255361F8CD62B00C58048 /* NotificationStatusButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationStatusButton.swift; sourceTree = "<group>"; };
 		2CA3DAA02179C6F600F43888 /* NotificationsRegistrationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsRegistrationService.swift; sourceTree = "<group>"; };
 		2CA3DAA22179C71500F43888 /* NotificationPermissionStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationPermissionStatus.swift; sourceTree = "<group>"; };
+		2CA47D49248ABF0E00925335 /* LogoutDataClearService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogoutDataClearService.swift; sourceTree = "<group>"; };
 		2CA9D97620109718007AA743 /* AdaptiveStatsPagerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveStatsPagerViewController.swift; sourceTree = "<group>"; };
 		2CA9D97820109727007AA743 /* AdaptiveStatsPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveStatsPresenter.swift; sourceTree = "<group>"; };
 		2CA9D97C20109C07007AA743 /* AdaptiveRatingsPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveRatingsPresenter.swift; sourceTree = "<group>"; };
@@ -1828,6 +1851,7 @@
 		2CB2740322C515050078CA2F /* QuizElementView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuizElementView.swift; sourceTree = "<group>"; };
 		2CB3563D2476CB7B00E59A03 /* MagicLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicLink.swift; sourceTree = "<group>"; };
 		2CB37E6523902BB80050D85E /* StorageUsageService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageUsageService.swift; sourceTree = "<group>"; };
+		2CB510ED248C226A00DB8344 /* VideosPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideosPersistenceService.swift; sourceTree = "<group>"; };
 		2CB51F6A204FC6220008431C /* UserActivitySpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActivitySpec.swift; sourceTree = "<group>"; };
 		2CB62BDA2019ECB800B5E336 /* OnboardingCardStepViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCardStepViewController.swift; sourceTree = "<group>"; };
 		2CB62BDD2019FD8400B5E336 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = ru; path = OnboardingContent/ru.lproj/step3.html; sourceTree = "<group>"; };
@@ -1914,6 +1938,11 @@
 		2CE8391020C8101500FE3672 /* AchievementBadgeView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AchievementBadgeView.xib; sourceTree = "<group>"; };
 		2CE8391220C8102200FE3672 /* AchievementBadgeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AchievementBadgeView.swift; sourceTree = "<group>"; };
 		2CE8BA9A23D631E500C2EED9 /* ImageStoredFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageStoredFileManager.swift; sourceTree = "<group>"; };
+		2CE9BF43248D07D0004F6659 /* CodeTemplatesPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeTemplatesPersistenceService.swift; sourceTree = "<group>"; };
+		2CE9BF45248D08A8004F6659 /* CodeSamplesPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeSamplesPersistenceService.swift; sourceTree = "<group>"; };
+		2CE9BF47248D0950004F6659 /* CodeLimitsPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeLimitsPersistenceService.swift; sourceTree = "<group>"; };
+		2CE9BF49248D09FC004F6659 /* BlocksPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlocksPersistenceService.swift; sourceTree = "<group>"; };
+		2CE9BF4B248D0EC5004F6659 /* VideoURLsPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoURLsPersistenceService.swift; sourceTree = "<group>"; };
 		2CEBEBF1242F8E9900DBFDF0 /* StepikRequestInterceptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepikRequestInterceptor.swift; sourceTree = "<group>"; };
 		2CEBEBF3242F8F9900DBFDF0 /* StepikRequestAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepikRequestAdapter.swift; sourceTree = "<group>"; };
 		2CEBEBF5242F8FB200DBFDF0 /* StepikRequestRetrier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepikRequestRetrier.swift; sourceTree = "<group>"; };
@@ -2044,6 +2073,7 @@
 		62E9836215CBA17A347B0BA2 /* NewMatchingQuizInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewMatchingQuizInteractor.swift; sourceTree = "<group>"; };
 		62E98382552527F92D26C681 /* CourseInfoBlurredBackgroundView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseInfoBlurredBackgroundView.swift; sourceTree = "<group>"; };
 		62E9838546792D675BC7EA54 /* BaseExploreDataFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseExploreDataFlow.swift; sourceTree = "<group>"; };
+		62E983871207544AF21C27C6 /* CertificatesPersistenceService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CertificatesPersistenceService.swift; sourceTree = "<group>"; };
 		62E9838A9933D0C52A639CEE /* DownloadsProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadsProvider.swift; sourceTree = "<group>"; };
 		62E98390BA7859C78E2E9AAA /* CodeQuizFullscreenRunCodeDataFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeQuizFullscreenRunCodeDataFlow.swift; sourceTree = "<group>"; };
 		62E9839124C1BE3BE89FD895 /* LessonInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LessonInteractor.swift; sourceTree = "<group>"; };
@@ -2223,6 +2253,7 @@
 		62E989B9228830C92A91B2DE /* CourseListsCollectionSkeletonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseListsCollectionSkeletonView.swift; sourceTree = "<group>"; };
 		62E989C1B6DA79B8DA2E66D6 /* HomeProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeProvider.swift; sourceTree = "<group>"; };
 		62E989D0C0B39B62D2EF9A05 /* CourseListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseListView.swift; sourceTree = "<group>"; };
+		62E989EE577036747B419AAC /* LastCodeLanguagePersistenceService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LastCodeLanguagePersistenceService.swift; sourceTree = "<group>"; };
 		62E989F28C53D0189666044B /* QuizOutputProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuizOutputProtocol.swift; sourceTree = "<group>"; };
 		62E989FAD86F79364CC2EF89 /* ProgressesNetworkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProgressesNetworkService.swift; sourceTree = "<group>"; };
 		62E989FEFDC26A706157D1AB /* Analytics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Analytics.swift; sourceTree = "<group>"; };
@@ -2247,6 +2278,7 @@
 		62E98ABA6ADA2DEA8E21746B /* CourseInfoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseInfoView.swift; sourceTree = "<group>"; };
 		62E98AC188792B6E7B8EABC9 /* CourseListCollectionOutputProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseListCollectionOutputProtocol.swift; sourceTree = "<group>"; };
 		62E98AC3108C157422114826 /* CourseListsCollectionNetworkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseListsCollectionNetworkService.swift; sourceTree = "<group>"; };
+		62E98AC352F76C23F60E12A6 /* LastStepPersistenceService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LastStepPersistenceService.swift; sourceTree = "<group>"; };
 		62E98ACC8B72B1F7CD89ECC0 /* DownloadsInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadsInteractor.swift; sourceTree = "<group>"; };
 		62E98ACD0C7925E448A14220 /* CourseInfoTabInfoProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseInfoTabInfoProvider.swift; sourceTree = "<group>"; };
 		62E98AD03F8BA48F04CAE503 /* CodeQuizPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeQuizPresenter.swift; sourceTree = "<group>"; };
@@ -2333,6 +2365,7 @@
 		62E98D428FEE732BA33E751E /* StepInputProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StepInputProtocol.swift; sourceTree = "<group>"; };
 		62E98D4604B2021759120234 /* NewFreeAnswerQuizViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewFreeAnswerQuizViewController.swift; sourceTree = "<group>"; };
 		62E98D462B4BF802AB9E0440 /* SettingsAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsAssembly.swift; sourceTree = "<group>"; };
+		62E98D6C6FA9C92ABDECEF12 /* NotificationsPersistenceService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationsPersistenceService.swift; sourceTree = "<group>"; };
 		62E98D6C74C01E5709B34288 /* SolutionAssembly.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SolutionAssembly.swift; sourceTree = "<group>"; };
 		62E98D7956697C2B5EE51670 /* CodeQuizProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeQuizProvider.swift; sourceTree = "<group>"; };
 		62E98D7CE99951BE99E0820A /* ContinueCourseInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContinueCourseInteractor.swift; sourceTree = "<group>"; };
@@ -2685,6 +2718,34 @@
 			path = Repository;
 			sourceTree = "<group>";
 		};
+		2C273262248BB46300BD065F /* ContentLanguage */ = {
+			isa = PBXGroup;
+			children = (
+				62E98256FF0135D7A7B59A54 /* ContentLanguageService.swift */,
+				62E9847B46C78DACD9B3EE72 /* ContentLanguageSwitchAvailabilityService.swift */,
+			);
+			path = ContentLanguage;
+			sourceTree = "<group>";
+		};
+		2C273263248BB49500BD065F /* CodeEditor */ = {
+			isa = PBXGroup;
+			children = (
+				2C20C86722F903D10052E9BF /* CodeEditorThemeService.swift */,
+				2C5E90832333DF2100288BE3 /* CodeLanguageSuggestionsService.swift */,
+			);
+			path = CodeEditor;
+			sourceTree = "<group>";
+		};
+		2C273264248BB4CC00BD065F /* AppData */ = {
+			isa = PBXGroup;
+			children = (
+				2C273265248BB60500BD065F /* DownloadsDeletionService.swift */,
+				2CA47D49248ABF0E00925335 /* LogoutDataClearService.swift */,
+				2CB37E6523902BB80050D85E /* StorageUsageService.swift */,
+			);
+			path = AppData;
+			sourceTree = "<group>";
+		};
 		2C284DB7247438F900669736 /* CoursePayment */ = {
 			isa = PBXGroup;
 			children = (
@@ -2879,6 +2940,15 @@
 			path = Video;
 			sourceTree = "<group>";
 		};
+		2C94C7F8248F816400E4104E /* UserCourse */ = {
+			isa = PBXGroup;
+			children = (
+				62E98BB94C146AA2D8A9C2FF /* UserCourse.swift */,
+				2C94C7F9248F86C900E4104E /* UserCourse+CoreDataProperties.swift */,
+			);
+			path = UserCourse;
+			sourceTree = "<group>";
+		};
 		2C99D087238967FD00078D2B /* Events */ = {
 			isa = PBXGroup;
 			children = (
@@ -3926,6 +3996,7 @@
 			children = (
 				08484EE4211AF42E0006266F /* CachedValue.swift */,
 				62E98D0214499A3812DE45C3 /* DataSourceType.swift */,
+				2C9BBE422490462C00FFED49 /* Debouncer.swift */,
 				2CD462E9226F4279004E4725 /* FetchResult.swift */,
 				62E98CF5FA317BCAFAE433A9 /* ImageDataProvider.swift */,
 				2C7F78392271D5480089FDD7 /* LayoutInsets.swift */,
@@ -4350,7 +4421,6 @@
 				080DCF161C4518BC00DE3E2E /* SearchResult.swift */,
 				088E73F32061BDAA00D458E3 /* StepikModelView.swift */,
 				08E6BB6A1DC8EB45006622EC /* UserActivity.swift */,
-				62E98BB94C146AA2D8A9C2FF /* UserCourse.swift */,
 				2CFF900B242A248800FD7311 /* Alerts */,
 				2CFF900E242A24C100FD7311 /* AttemptsSumbissions */,
 				2CFF9012242A250C00FD7311 /* Constants */,
@@ -4510,6 +4580,7 @@
 				2CFF902C242A26AB00FD7311 /* Unit */,
 				2CFF902D242A26B600FD7311 /* User */,
 				2C87A7A62446644700933CA4 /* UserActivity */,
+				2C94C7F8248F816400E4104E /* UserCourse */,
 				2CFF902E242A26C200FD7311 /* Video */,
 				2CFF902F242A26CE00FD7311 /* VideoURL */,
 			);
@@ -5054,13 +5125,21 @@
 			children = (
 				2CB9529D22A0351F00A6117A /* AssignmentsPersistenceService.swift */,
 				2C04BA532407C3BF00D74D4B /* AttemptsPersistenceService.swift */,
+				2CE9BF49248D09FC004F6659 /* BlocksPersistenceService.swift */,
+				62E983871207544AF21C27C6 /* CertificatesPersistenceService.swift */,
+				2CE9BF47248D0950004F6659 /* CodeLimitsPersistenceService.swift */,
+				2CE9BF45248D08A8004F6659 /* CodeSamplesPersistenceService.swift */,
+				2CE9BF43248D07D0004F6659 /* CodeTemplatesPersistenceService.swift */,
 				62E98C9F5E7C0823E94A4527 /* CourseListsCollectionPersistenceService.swift */,
 				62E98B4C083CFD4E93597D32 /* CourseReviewsPersistenceService.swift */,
 				62E985BDDC6349F80D395284 /* CourseReviewSummariesPersistenceService.swift */,
 				62E98B706335B4BAC35D3C6D /* CoursesPersistenceService.swift */,
 				2C4AD01A23E305FA0049B7B0 /* DiscussionThreadsPersistenceService.swift */,
 				2CD6E25C234E388B00F49303 /* EmailAddressesPersistenceService.swift */,
+				62E989EE577036747B419AAC /* LastCodeLanguagePersistenceService.swift */,
+				62E98AC352F76C23F60E12A6 /* LastStepPersistenceService.swift */,
 				62E985EA7905BE734BB77FBD /* LessonsPersistenceService.swift */,
+				62E98D6C6FA9C92ABDECEF12 /* NotificationsPersistenceService.swift */,
 				2C87A7A324465B5800933CA4 /* ProfilesPersistenceService.swift */,
 				62E9803E0D93EBBD439FFEDD /* ProgressesPersistenceService.swift */,
 				62E9867D3CF2B4F6A52B2B4A /* SectionsPersistenceService.swift */,
@@ -5069,7 +5148,10 @@
 				2C57B29E24092868008284F0 /* SubmissionsPersistenceService.swift */,
 				62E981BE70619C07A3F72EC9 /* UnitsPersistenceService.swift */,
 				2C87A7AC2446696D00933CA4 /* UserActivitiesPersistenceService.swift */,
+				2C16A88E248F98C9001E5CBD /* UserCoursesPersistenceService.swift */,
 				2C87A7A02446502900933CA4 /* UsersPersistenceService.swift */,
+				2CB510ED248C226A00DB8344 /* VideosPersistenceService.swift */,
+				2CE9BF4B248D0EC5004F6659 /* VideoURLsPersistenceService.swift */,
 			);
 			path = Persistence;
 			sourceTree = "<group>";
@@ -5628,7 +5710,7 @@
 			path = Helpers;
 			sourceTree = "<group>";
 		};
-		62E986D1988A3445F3416404 /* Managers */ = {
+		62E986D1988A3445F3416404 /* StorageManagers */ = {
 			isa = PBXGroup;
 			children = (
 				2C7F641D23B12208006C7648 /* AutoplayStorageManager.swift */,
@@ -5638,7 +5720,7 @@
 				2CF7E3332417C1A700B9188E /* UseCellularDataForDownloadsStorageManager.swift */,
 				2C8F3ADE23CCAB88004D113A /* Video */,
 			);
-			path = Managers;
+			path = StorageManagers;
 			sourceTree = "<group>";
 		};
 		62E986D974D797A3BDF8DA59 /* Extensions */ = {
@@ -6111,20 +6193,19 @@
 			isa = PBXGroup;
 			children = (
 				2C936D44243D3ADB00A4A4A9 /* ApplicationThemeService.swift */,
-				2C20C86722F903D10052E9BF /* CodeEditorThemeService.swift */,
-				2C5E90832333DF2100288BE3 /* CodeLanguageSuggestionsService.swift */,
-				62E98256FF0135D7A7B59A54 /* ContentLanguageService.swift */,
-				62E9847B46C78DACD9B3EE72 /* ContentLanguageSwitchAvailabilityService.swift */,
 				62E98EFD0E3B6DA84FCE723B /* DataBackUpdateService.swift */,
 				62E98E01F05F1205F284595F /* NetworkReachabilityService.swift */,
 				2CDAD309229EC81A00AA9EF5 /* PersistenceQueuesService.swift */,
-				2CB37E6523902BB80050D85E /* StorageUsageService.swift */,
 				2CDBCCCE23EB777E005D2370 /* SubmissionURLProvider.swift */,
 				62E98FBA6AB1C2BD6EA95634 /* UnitNavigationService.swift */,
 				62E98EBA0AF48AD90775FF7E /* UserAccountService.swift */,
-				62E986D1988A3445F3416404 /* Managers */,
+				2C9BBE4024903AB500FFED49 /* UserCoursesObserver.swift */,
+				2C273264248BB4CC00BD065F /* AppData */,
+				2C273263248BB49500BD065F /* CodeEditor */,
+				2C273262248BB46300BD065F /* ContentLanguage */,
 				62E98A358EF538D7F89D10F1 /* Models */,
 				2CDB95872412C04A00F676A7 /* Spotlight */,
+				62E986D1988A3445F3416404 /* StorageManagers */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -7000,6 +7081,7 @@
 				2C98B6B61FDFD74C005AB72C /* OnboardingViewController.swift in Sources */,
 				08C02DB41F53201A00F848F5 /* ProfilePresenter.swift in Sources */,
 				080CE1551E9563590089A27F /* ProgressesAPI.swift in Sources */,
+				2CA47D4A248ABF0E00925335 /* LogoutDataClearService.swift in Sources */,
 				0846B10C1EDDEE7F00D64D77 /* CodeLimit.swift in Sources */,
 				2C57B2A1240945B2008284F0 /* SubmissionsRepository.swift in Sources */,
 				2C97E009215E47E7005684A1 /* SearchQueriesViewController.swift in Sources */,
@@ -7057,6 +7139,7 @@
 				08D5F5801F7DBA70007C1634 /* CourseReviewSummariesAPI.swift in Sources */,
 				2CA100162174BB66003775CB /* PersonalDeadlineLocalNotificationContentProvider.swift in Sources */,
 				08FA62242121BF1200F00275 /* ShrinkDismissAnimationController.swift in Sources */,
+				2C273266248BB60500BD065F /* DownloadsDeletionService.swift in Sources */,
 				080ACF501BD79D5500329F2B /* Images.swift in Sources */,
 				082B54DB20AA445C00144817 /* DeadlineMode.swift in Sources */,
 				08CBA2F81F573F6900302154 /* MenuViewController.swift in Sources */,
@@ -7214,6 +7297,7 @@
 				087296DC20168FF2009F9256 /* TooltipDefaultsManager.swift in Sources */,
 				2CF08861205BEE2C00FCB9C0 /* StepikPlaceholder.swift in Sources */,
 				080CE1431E955D300089A27F /* CoursesAPI.swift in Sources */,
+				2CE9BF4A248D09FC004F6659 /* BlocksPersistenceService.swift in Sources */,
 				08F485A51C57AF2E000165AA /* FreeAnswerReply.swift in Sources */,
 				08C1FC331F41E74500E14B46 /* QuizPresenter.swift in Sources */,
 				2C604E21207E4609001588FB /* CodeEditorPreviewView.swift in Sources */,
@@ -7295,6 +7379,7 @@
 				08F485AA1C580D61000165AA /* MathReply.swift in Sources */,
 				08E43E99214C279700E3CB50 /* PushRouterSourceProtocol.swift in Sources */,
 				2C2F0BE72186EEB8007DCA0A /* StreakNotificationsRequestAlertDataSource.swift in Sources */,
+				2C9BBE4124903AB500FFED49 /* UserCoursesObserver.swift in Sources */,
 				2CB62BDB2019ECB800B5E336 /* OnboardingCardStepViewController.swift in Sources */,
 				08E7CA1020DAF6E0004F8563 /* AnalyticsUserProperties.swift in Sources */,
 				2C2972052147F5FD001502BD /* CourseTag.swift in Sources */,
@@ -7303,6 +7388,7 @@
 				089611041D52250500561AC1 /* DeepLinkRouter.swift in Sources */,
 				08FEFC1C1F117257005CA0FB /* CodeSuggestionTableViewCell.swift in Sources */,
 				2C4BE7DE221325FB00AEAC34 /* CourseReview.swift in Sources */,
+				2CE9BF48248D0950004F6659 /* CodeLimitsPersistenceService.swift in Sources */,
 				2C48D604228F0EF700739477 /* ContentProcessingRule.swift in Sources */,
 				083F2B211E9E645000714173 /* CertificateTableViewCell.swift in Sources */,
 				08CA59F21BBFD65E008DC44D /* User.swift in Sources */,
@@ -7320,6 +7406,7 @@
 				2CB9E8C41F7AA5CD0004E17F /* NotificationsPresenter.swift in Sources */,
 				08F485A21C57987C000165AA /* NumberQuizViewController.swift in Sources */,
 				2C5DF1431FED2758003B1177 /* CardStepDelegate.swift in Sources */,
+				2CE9BF4C248D0EC5004F6659 /* VideoURLsPersistenceService.swift in Sources */,
 				2C48D601228F0C6000739477 /* ContentProcessor.swift in Sources */,
 				2C97E00B215E47F3005684A1 /* SearchQueriesPersistentManager.swift in Sources */,
 				08901E721CD1173200D94613 /* Version.swift in Sources */,
@@ -7357,6 +7444,7 @@
 				080EBA331EA64BC000C43C93 /* PresentationContainer.swift in Sources */,
 				084DDDE1204EDF7600913503 /* NotificationRequestAlertViewController.swift in Sources */,
 				2C2485472101D91F006F8858 /* RestorableBackgroundDownloaderProtocol.swift in Sources */,
+				2CE9BF46248D08A8004F6659 /* CodeSamplesPersistenceService.swift in Sources */,
 				2C92669720B5C7CF00525AFC /* PlaceholderTableViewCell.swift in Sources */,
 				2CC0754720177A2E004A6005 /* AdaptiveStatsViewController.swift in Sources */,
 				2C80C829201A504700ABB312 /* StepCardView.swift in Sources */,
@@ -7553,6 +7641,7 @@
 				62E98116576B12451E5418F4 /* CourseCoverImageView.swift in Sources */,
 				2C936D45243D3ADB00A4A4A9 /* ApplicationThemeService.swift in Sources */,
 				2C7F641C23B0F5B7006C7648 /* PlayNextCircleControlView.swift in Sources */,
+				2C9BBE432490462C00FFED49 /* Debouncer.swift in Sources */,
 				62E98C3824298B04928351E5 /* FormatterHelper.swift in Sources */,
 				2CF10C8B238426B300F8CC95 /* StepSourcesNetworkService.swift in Sources */,
 				2C04BA47240726BA00D74D4B /* SubmissionEntity+CoreDataProperties.swift in Sources */,
@@ -7567,6 +7656,7 @@
 				62E9860632B3BB21E24DF368 /* SectionsNetworkService.swift in Sources */,
 				62E9851C596D4146AC811EAE /* UnitsNetworkService.swift in Sources */,
 				62E983B402214CA82BF050E8 /* LessonsNetworkService.swift in Sources */,
+				2CE9BF44248D07D0004F6659 /* CodeTemplatesPersistenceService.swift in Sources */,
 				2C8F3AE123CCBD26004D113A /* DownloadVideoQuality.swift in Sources */,
 				2CDB95892412C08100F676A7 /* SpotlightContinueUserActivityService.swift in Sources */,
 				62E98F5FB06328B5D7212700 /* HighlightFakeButton.swift in Sources */,
@@ -7585,6 +7675,7 @@
 				2C20C86C22F988030052E9BF /* CodeEditorTheme.swift in Sources */,
 				62E98B337D0BA97FB0796C2C /* CoursesNetworkService.swift in Sources */,
 				62E98793982B530188C654BE /* UsersNetworkService.swift in Sources */,
+				2C16A88F248F98C9001E5CBD /* UserCoursesPersistenceService.swift in Sources */,
 				62E981F21F0275F8547E0658 /* ProgressesPersistenceService.swift in Sources */,
 				62E984F71594AA4CD19696EC /* CoursesPersistenceService.swift in Sources */,
 				62E98E58E7BC6B6AF4881084 /* CourseReviewSummariesPersistenceService.swift in Sources */,
@@ -7858,6 +7949,7 @@
 				62E988C4572F2A9C97348C83 /* CodeQuizView.swift in Sources */,
 				62E98707AF0BEE9807661F4A /* CodeQuizViewController.swift in Sources */,
 				62E98866B15E76B9FE106E1B /* CodeQuizViewModel.swift in Sources */,
+				2CB510EE248C226A00DB8344 /* VideosPersistenceService.swift in Sources */,
 				62E98856B2540336E5867457 /* UnsupportedCodeLanguageView.swift in Sources */,
 				62E9841E806D9AF0E9C8D199 /* CodeDetailsButton.swift in Sources */,
 				62E9804624D413C3F8D71AC7 /* CodeDetailsContentView.swift in Sources */,
@@ -7870,6 +7962,7 @@
 				62E98C3F01034400CAABD717 /* CodeTextViewLayoutManager.swift in Sources */,
 				62E98EEB59DAF1D0700A7DB9 /* CodeLanguagePickerView.swift in Sources */,
 				62E98A2B85DD1D883B5BFEC7 /* CodeToolbarLanguagePickerButton.swift in Sources */,
+				2C94C7FA248F86C900E4104E /* UserCourse+CoreDataProperties.swift in Sources */,
 				2CC5AA71242A34FA00C09F94 /* AdaptiveStatsManager.swift in Sources */,
 				62E98F91C1E401E5C9855DB1 /* CodeToolbarView.swift in Sources */,
 				62E9817AE10960C05029CA37 /* CodeQuizFullscreenAssembly.swift in Sources */,
@@ -8023,6 +8116,10 @@
 				62E98DDC32C86496C6953A1E /* AnalyticsEngine.swift in Sources */,
 				62E98F1672B90358D7188D02 /* AnalyticsEvent.swift in Sources */,
 				62E9888417EE1DD05B20491B /* CoursePayment.swift in Sources */,
+				62E9877F4784A8C707B4B712 /* CertificatesPersistenceService.swift in Sources */,
+				62E987084C26B24E039EA0A0 /* NotificationsPersistenceService.swift in Sources */,
+				62E98778B1320381E97A0E1F /* LastStepPersistenceService.swift in Sources */,
+				62E98672DA4B29B46167B0A4 /* LastCodeLanguagePersistenceService.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8375,7 +8472,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 216;
+				CURRENT_PROJECT_VERSION = 219;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = Stepic/Info.plist;
@@ -8405,7 +8502,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 216;
+				CURRENT_PROJECT_VERSION = 219;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = Stepic/Info.plist;
@@ -8467,6 +8564,7 @@
 		08D1EF6E1BB5618700BE84E6 /* Model.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				2C94C7F7248F7E0F00E4104E /* Model_user_courses_v52.xcdatamodel */,
 				2C7466402456065F00BB0800 /* Model_user_courses_actions_v51.xcdatamodel */,
 				2C87A7A52446635E00933CA4 /* Model_user_activity_v50.xcdatamodel */,
 				2C04BA3724058AF100D74D4B /* Model_attempts_caching.xcdatamodel */,
@@ -8520,7 +8618,7 @@
 				0802AC531C7222B200C4F3E6 /* Model_v2.xcdatamodel */,
 				08D1EF6F1BB5618700BE84E6 /* Model.xcdatamodel */,
 			);
-			currentVersion = 2C7466402456065F00BB0800 /* Model_user_courses_actions_v51.xcdatamodel */;
+			currentVersion = 2C94C7F7248F7E0F00E4104E /* Model_user_courses_v52.xcdatamodel */;
 			path = Model.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
diff --git a/Stepic/Images.xcassets/New course list/course-widget-archive.imageset/Contents.json b/Stepic/Images.xcassets/New course list/course-widget-archive.imageset/Contents.json
new file mode 100644
index 0000000000..fb01bdca56
--- /dev/null
+++ b/Stepic/Images.xcassets/New course list/course-widget-archive.imageset/Contents.json	
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "course-widget-archive.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Stepic/Images.xcassets/New course list/course-widget-archive.imageset/course-widget-archive.pdf b/Stepic/Images.xcassets/New course list/course-widget-archive.imageset/course-widget-archive.pdf
new file mode 100644
index 0000000000..72e54e2100
Binary files /dev/null and b/Stepic/Images.xcassets/New course list/course-widget-archive.imageset/course-widget-archive.pdf differ
diff --git a/Stepic/Images.xcassets/New course list/course-widget-certificate.imageset/Contents.json b/Stepic/Images.xcassets/New course list/course-widget-certificate.imageset/Contents.json
new file mode 100644
index 0000000000..62ec355314
--- /dev/null
+++ b/Stepic/Images.xcassets/New course list/course-widget-certificate.imageset/Contents.json	
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "course-widget-certificate.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Stepic/Images.xcassets/New course list/course-widget-certificate.imageset/course-widget-certificate.pdf b/Stepic/Images.xcassets/New course list/course-widget-certificate.imageset/course-widget-certificate.pdf
new file mode 100644
index 0000000000..337b04aa76
Binary files /dev/null and b/Stepic/Images.xcassets/New course list/course-widget-certificate.imageset/course-widget-certificate.pdf differ
diff --git a/Stepic/Images.xcassets/New course list/course-widget-favorite.imageset/Contents.json b/Stepic/Images.xcassets/New course list/course-widget-favorite.imageset/Contents.json
new file mode 100644
index 0000000000..fc4448b84a
--- /dev/null
+++ b/Stepic/Images.xcassets/New course list/course-widget-favorite.imageset/Contents.json	
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "course-widget-favorite.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}
diff --git a/Stepic/Images.xcassets/New course list/course-widget-favorite.imageset/course-widget-favorite.pdf b/Stepic/Images.xcassets/New course list/course-widget-favorite.imageset/course-widget-favorite.pdf
new file mode 100644
index 0000000000..62d3dbc85c
Binary files /dev/null and b/Stepic/Images.xcassets/New course list/course-widget-favorite.imageset/course-widget-favorite.pdf differ
diff --git a/Stepic/Info.plist b/Stepic/Info.plist
index 8162ae5883..c19a3193e6 100644
--- a/Stepic/Info.plist
+++ b/Stepic/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.126</string>
+	<string>1.127</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -54,7 +54,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>216</string>
+	<string>219</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>
diff --git a/Stepic/Legacy/AppDelegate.swift b/Stepic/Legacy/AppDelegate.swift
index 5b6af5bb19..d5e0630e2f 100644
--- a/Stepic/Legacy/AppDelegate.swift
+++ b/Stepic/Legacy/AppDelegate.swift
@@ -29,6 +29,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     private let branchService = BranchService()
     private let spotlightContinueUserActivityService: SpotlightContinueUserActivityServiceProtocol = SpotlightContinueUserActivityService()
     private let notificationPermissionStatusSettingsObserver = NotificationPermissionStatusSettingsObserver()
+    private let userCoursesObserver: UserCoursesObserverProtocol = UserCoursesObserver()
     private lazy var analytics: Analytics = { StepikAnalytics.shared }()
 
     deinit {
@@ -135,10 +136,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         self.analytics.send(.applicationDidBecomeActive)
         NotificationsBadgesManager.shared.set(number: application.applicationIconBadgeNumber)
         self.notificationsService.removeRetentionNotifications()
+        self.userCoursesObserver.startObserving()
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
         self.notificationsService.scheduleRetentionNotifications()
+        self.userCoursesObserver.stopObserving()
     }
 
     // MARK: - Downloading Data in the Background
diff --git a/Stepic/Legacy/Controllers/Notifications/Helpers/NotificationsBadgesManager.swift b/Stepic/Legacy/Controllers/Notifications/Helpers/NotificationsBadgesManager.swift
index 7ef963b64b..bb2018bfa1 100644
--- a/Stepic/Legacy/Controllers/Notifications/Helpers/NotificationsBadgesManager.swift
+++ b/Stepic/Legacy/Controllers/Notifications/Helpers/NotificationsBadgesManager.swift
@@ -12,6 +12,7 @@ extension NSNotification.Name {
     static let badgeUpdated = NSNotification.Name("badgeUpdated")
 }
 
+@available(*, deprecated, message: "Legacy class")
 final class NotificationsBadgesManager {
     static let shared = NotificationsBadgesManager()
 
diff --git a/Stepic/Legacy/Helpers/CoreDataHelper.swift b/Stepic/Legacy/Helpers/CoreDataHelper.swift
index dd2ccb8168..a808e930da 100644
--- a/Stepic/Legacy/Helpers/CoreDataHelper.swift
+++ b/Stepic/Legacy/Helpers/CoreDataHelper.swift
@@ -9,6 +9,7 @@
 import CoreData
 import UIKit
 
+@available(*, deprecated, message: "Legacy class")
 final class CoreDataHelper: NSObject {
     static var shared = CoreDataHelper()
 
diff --git a/Stepic/Legacy/Model/Entities/Assignment/Assignment+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Assignment/Assignment+CoreDataProperties.swift
index 25ee2fbc77..dafcbabfd9 100644
--- a/Stepic/Legacy/Model/Entities/Assignment/Assignment+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Assignment/Assignment+CoreDataProperties.swift
@@ -21,6 +21,10 @@ extension Assignment {
         NSEntityDescription.entity(forEntityName: "Assignment", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Assignment> {
+        NSFetchRequest<Assignment>(entityName: "Assignment")
+    }
+
     convenience init() {
         self.init(entity: Assignment.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Attempt/AttemptEntity+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Attempt/AttemptEntity+CoreDataProperties.swift
index 837865942f..8d55406fea 100644
--- a/Stepic/Legacy/Model/Entities/Attempt/AttemptEntity+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Attempt/AttemptEntity+CoreDataProperties.swift
@@ -21,7 +21,7 @@ extension AttemptEntity {
         [NSSortDescriptor(key: #keyPath(managedID), ascending: false)]
     }
 
-    static func fetchRequest() -> NSFetchRequest<AttemptEntity> {
+    static var fetchRequest: NSFetchRequest<AttemptEntity> {
         NSFetchRequest<AttemptEntity>(entityName: "AttemptEntity")
     }
 }
diff --git a/Stepic/Legacy/Model/Entities/Block/Block+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Block/Block+CoreDataProperties.swift
index a92a46bf00..34bebec05d 100644
--- a/Stepic/Legacy/Model/Entities/Block/Block+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Block/Block+CoreDataProperties.swift
@@ -24,6 +24,10 @@ extension Block {
         NSEntityDescription.entity(forEntityName: "Block", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Block> {
+        NSFetchRequest<Block>(entityName: "Block")
+    }
+
     convenience init() {
         self.init(entity: Block.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Certificate/Certificate+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Certificate/Certificate+CoreDataProperties.swift
index 6bce721141..802ed5c7ab 100644
--- a/Stepic/Legacy/Model/Entities/Certificate/Certificate+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Certificate/Certificate+CoreDataProperties.swift
@@ -25,6 +25,10 @@ extension Certificate {
         NSEntityDescription.entity(forEntityName: "Certificate", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Certificate> {
+        NSFetchRequest<Certificate>(entityName: "Certificate")
+    }
+
     convenience init() {
         self.init(entity: Certificate.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Certificate/Certificate.swift b/Stepic/Legacy/Model/Entities/Certificate/Certificate.swift
index 01087c01ef..6251d6569f 100644
--- a/Stepic/Legacy/Model/Entities/Certificate/Certificate.swift
+++ b/Stepic/Legacy/Model/Entities/Certificate/Certificate.swift
@@ -53,17 +53,4 @@ final class Certificate: NSManagedObject, IDFetchable {
             return []
         }
     }
-
-    //TODO: Refactor this action to protocol extension when refactoring CoreData
-    static func deleteAll() {
-        let request = NSFetchRequest<NSFetchRequestResult>(entityName: "Certificate")
-        do {
-            let results = try CoreDataHelper.shared.context.fetch(request) as? [Certificate]
-            for obj in results ?? [] {
-                CoreDataHelper.shared.deleteFromStore(obj)
-            }
-        } catch {
-            print("certificate: couldn't delete all certificates!")
-        }
-    }
 }
diff --git a/Stepic/Legacy/Model/Entities/CodeLimit/CodeLimit+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/CodeLimit/CodeLimit+CoreDataProperties.swift
index 7614d74a84..8578c9dd97 100644
--- a/Stepic/Legacy/Model/Entities/CodeLimit/CodeLimit+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/CodeLimit/CodeLimit+CoreDataProperties.swift
@@ -20,6 +20,10 @@ extension CodeLimit {
         NSEntityDescription.entity(forEntityName: "CodeLimit", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<CodeLimit> {
+        NSFetchRequest<CodeLimit>(entityName: "CodeLimit")
+    }
+
     convenience init() {
         self.init(entity: CodeLimit.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/CodeSample/CodeSample+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/CodeSample/CodeSample+CoreDataProperties.swift
index d4f8b18502..8e0bc7eda1 100644
--- a/Stepic/Legacy/Model/Entities/CodeSample/CodeSample+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/CodeSample/CodeSample+CoreDataProperties.swift
@@ -19,6 +19,10 @@ extension CodeSample {
         NSEntityDescription.entity(forEntityName: "CodeSample", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<CodeSample> {
+        NSFetchRequest<CodeSample>(entityName: "CodeSample")
+    }
+
     convenience init() {
         self.init(entity: CodeSample.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/CodeTemplates/CodeTemplate+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/CodeTemplates/CodeTemplate+CoreDataProperties.swift
index d2b7ad5c61..6f52e882cd 100644
--- a/Stepic/Legacy/Model/Entities/CodeTemplates/CodeTemplate+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/CodeTemplates/CodeTemplate+CoreDataProperties.swift
@@ -20,6 +20,10 @@ extension CodeTemplate {
         NSEntityDescription.entity(forEntityName: "CodeTemplate", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<CodeTemplate> {
+        NSFetchRequest<CodeTemplate>(entityName: "CodeTemplate")
+    }
+
     convenience init() {
         self.init(entity: CodeTemplate.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Course/Course+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Course/Course+CoreDataProperties.swift
index 91b4c0cde0..436339f2b8 100644
--- a/Stepic/Legacy/Model/Entities/Course/Course+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Course/Course+CoreDataProperties.swift
@@ -65,6 +65,7 @@ extension Course {
     @NSManaged var managedProgress: Progress?
     @NSManaged var managedReviewSummary: CourseReviewSummary?
     @NSManaged var managedSections: NSOrderedSet?
+    @NSManaged var managedUserCourse: UserCourse?
 
     static var oldEntity: NSEntityDescription {
         NSEntityDescription.entity(forEntityName: "Course", in: CoreDataHelper.shared.context)!
@@ -489,6 +490,15 @@ extension Course {
         }
     }
 
+    var userCourse: UserCourse? {
+        get {
+            self.managedUserCourse
+        }
+        set {
+            self.managedUserCourse = newValue
+        }
+    }
+
     var canWriteReview: Bool {
         if let progress = self.progress {
             return (Double(progress.numberOfStepsPassed) * 100.0 / Double(progress.numberOfSteps)) >= 80.0
diff --git a/Stepic/Legacy/Model/Entities/CourseReview/CourseReview+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/CourseReview/CourseReview+CoreDataProperties.swift
index aaa6bfdd05..880e0fc9e7 100644
--- a/Stepic/Legacy/Model/Entities/CourseReview/CourseReview+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/CourseReview/CourseReview+CoreDataProperties.swift
@@ -24,6 +24,10 @@ extension CourseReview {
         NSEntityDescription.entity(forEntityName: "CourseReview", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<CourseReview> {
+        NSFetchRequest<CourseReview>(entityName: "CourseReview")
+    }
+
     convenience init() {
         self.init(entity: CourseReview.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/CourseReviewSummary/CourseReviewSummary+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/CourseReviewSummary/CourseReviewSummary+CoreDataProperties.swift
index 72c22f6146..57397db158 100644
--- a/Stepic/Legacy/Model/Entities/CourseReviewSummary/CourseReviewSummary+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/CourseReviewSummary/CourseReviewSummary+CoreDataProperties.swift
@@ -21,6 +21,10 @@ extension CourseReviewSummary {
         NSEntityDescription.entity(forEntityName: "CourseReviewSummary", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<CourseReviewSummary> {
+        NSFetchRequest<CourseReviewSummary>(entityName: "CourseReviewSummary")
+    }
+
     convenience init() {
         self.init(entity: CourseReviewSummary.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/DiscussionThread/DiscussionThread+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/DiscussionThread/DiscussionThread+CoreDataProperties.swift
index 43ebded1e2..38f6660c9a 100644
--- a/Stepic/Legacy/Model/Entities/DiscussionThread/DiscussionThread+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/DiscussionThread/DiscussionThread+CoreDataProperties.swift
@@ -13,6 +13,10 @@ extension DiscussionThread {
         NSEntityDescription.entity(forEntityName: "DiscussionThread", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<DiscussionThread> {
+        NSFetchRequest<DiscussionThread>(entityName: "DiscussionThread")
+    }
+
     convenience init() {
         self.init(entity: DiscussionThread.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/EmailAddress/EmailAddress+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/EmailAddress/EmailAddress+CoreDataProperties.swift
index b18524f9f3..6c3d52ba94 100644
--- a/Stepic/Legacy/Model/Entities/EmailAddress/EmailAddress+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/EmailAddress/EmailAddress+CoreDataProperties.swift
@@ -22,6 +22,10 @@ extension EmailAddress {
         NSEntityDescription.entity(forEntityName: "EmailAddress", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<EmailAddress> {
+        NSFetchRequest<EmailAddress>(entityName: "EmailAddress")
+    }
+
     convenience init() {
         self.init(entity: EmailAddress.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/LastCodeLanguage/LastCodeLanguage+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/LastCodeLanguage/LastCodeLanguage+CoreDataProperties.swift
index b8f82a662f..10c7c8d1e8 100644
--- a/Stepic/Legacy/Model/Entities/LastCodeLanguage/LastCodeLanguage+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/LastCodeLanguage/LastCodeLanguage+CoreDataProperties.swift
@@ -9,6 +9,10 @@ extension LastCodeLanguage {
         NSEntityDescription.entity(forEntityName: "LastCodeLanguage", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<LastCodeLanguage> {
+        NSFetchRequest<LastCodeLanguage>(entityName: "LastCodeLanguage")
+    }
+
     convenience init() {
         self.init(entity: LastCodeLanguage.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/LastStep/LastStep+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/LastStep/LastStep+CoreDataProperties.swift
index 6f75ea5dbb..3224b7e4fc 100644
--- a/Stepic/Legacy/Model/Entities/LastStep/LastStep+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/LastStep/LastStep+CoreDataProperties.swift
@@ -20,6 +20,10 @@ extension LastStep {
         NSEntityDescription.entity(forEntityName: "LastStep", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<LastStep> {
+        NSFetchRequest<LastStep>(entityName: "LastStep")
+    }
+
     convenience init() {
         self.init(entity: LastStep.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Lesson/Lesson+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Lesson/Lesson+CoreDataProperties.swift
index 08c1ef11a6..19c5eba545 100644
--- a/Stepic/Legacy/Model/Entities/Lesson/Lesson+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Lesson/Lesson+CoreDataProperties.swift
@@ -32,6 +32,10 @@ extension Lesson {
         NSEntityDescription.entity(forEntityName: "Lesson", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Lesson> {
+        NSFetchRequest<Lesson>(entityName: "Lesson")
+    }
+
     convenience init() {
         self.init(entity: Lesson.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Notification/Notification+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Notification/Notification+CoreDataProperties.swift
index c366681574..dcf0fc3c06 100644
--- a/Stepic/Legacy/Model/Entities/Notification/Notification+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Notification/Notification+CoreDataProperties.swift
@@ -25,13 +25,17 @@ extension Notification {
         NSEntityDescription.entity(forEntityName: "Notification", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Notification> {
+        NSFetchRequest<Notification>(entityName: "Notification")
+    }
+
     convenience init() {
         self.init(entity: Notification.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
 
     var id: Int {
         get {
-             managedId?.intValue ?? -1
+            managedId?.intValue ?? -1
         }
         set {
             managedId = newValue as NSNumber?
@@ -40,7 +44,7 @@ extension Notification {
 
     var htmlText: String? {
         get {
-             managedHtmlText
+            managedHtmlText
         }
         set {
             managedHtmlText = newValue
@@ -49,7 +53,7 @@ extension Notification {
 
     var time: Date? {
         get {
-             managedTime
+            managedTime
         }
         set {
             managedTime = newValue
@@ -70,7 +74,7 @@ extension Notification {
 
     var isMuted: Bool {
         get {
-             managedIsMuted?.boolValue ?? false
+            managedIsMuted?.boolValue ?? false
         }
         set {
             managedIsMuted = newValue as NSNumber?
@@ -79,7 +83,7 @@ extension Notification {
 
     var isFavorite: Bool {
         get {
-             managedIsFavorite?.boolValue ?? false
+            managedIsFavorite?.boolValue ?? false
         }
         set {
             managedIsFavorite = newValue as NSNumber?
@@ -113,7 +117,7 @@ extension Notification {
     // Maybe it will be helpful in the future
     var priority: String? {
         get {
-             managedPriority
+            managedPriority
         }
         set {
             managedPriority = newValue
@@ -123,7 +127,7 @@ extension Notification {
     // Maybe it will be helpful in the future
     var level: String? {
         get {
-             managedLevel
+            managedLevel
         }
         set {
             managedLevel = newValue
diff --git a/Stepic/Legacy/Model/Entities/Notification/Notification+FetchMethods.swift b/Stepic/Legacy/Model/Entities/Notification/Notification+FetchMethods.swift
index 2a89cb1c62..e134cd30f2 100644
--- a/Stepic/Legacy/Model/Entities/Notification/Notification+FetchMethods.swift
+++ b/Stepic/Legacy/Model/Entities/Notification/Notification+FetchMethods.swift
@@ -56,18 +56,6 @@ extension Notification {
         }
     }
 
-    static func deleteAll() {
-        let request = NSFetchRequest<NSFetchRequestResult>(entityName: "Notification")
-        do {
-            let results = try CoreDataHelper.shared.context.fetch(request) as? [Notification]
-            for obj in results ?? [] {
-                CoreDataHelper.shared.deleteFromStore(obj)
-            }
-        } catch {
-            print("notification: couldn't delete all notifications!")
-        }
-    }
-
     static func markAllAsRead() {
         let request = NSBatchUpdateRequest(entityName: "Notification")
         request.predicate = NSPredicate(value: true)
diff --git a/Stepic/Legacy/Model/Entities/Profile/Profile+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Profile/Profile+CoreDataProperties.swift
index 61da7466e9..5994a4c9cb 100644
--- a/Stepic/Legacy/Model/Entities/Profile/Profile+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Profile/Profile+CoreDataProperties.swift
@@ -29,7 +29,7 @@ extension Profile {
         [NSSortDescriptor(key: #keyPath(managedId), ascending: false)]
     }
 
-    static func fetchRequest() -> NSFetchRequest<Profile> {
+    static var fetchRequest: NSFetchRequest<Profile> {
         NSFetchRequest<Profile>(entityName: "Profile")
     }
 
diff --git a/Stepic/Legacy/Model/Entities/Progress/Progress+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Progress/Progress+CoreDataProperties.swift
index 72e4ce460d..3c72a27d35 100644
--- a/Stepic/Legacy/Model/Entities/Progress/Progress+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Progress/Progress+CoreDataProperties.swift
@@ -30,6 +30,10 @@ extension Progress {
         NSEntityDescription.entity(forEntityName: "Progress", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Progress> {
+        NSFetchRequest<Progress>(entityName: "Progress")
+    }
+
     convenience init() {
         self.init(entity: Progress.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Progress/Progress.swift b/Stepic/Legacy/Model/Entities/Progress/Progress.swift
index 48d22a2ccb..656a95ffbe 100644
--- a/Stepic/Legacy/Model/Entities/Progress/Progress.swift
+++ b/Stepic/Legacy/Model/Entities/Progress/Progress.swift
@@ -49,17 +49,4 @@ final class Progress: NSManagedObject, JSONSerializable, IDFetchable {
             ? Float(self.numberOfStepsPassed) / Float(self.numberOfSteps) * 100
             : 100.0
     }
-
-    static func deleteAllStoredProgresses() {
-        let request = NSFetchRequest<NSFetchRequestResult>(entityName: "Progress")
-
-        do {
-            let results = try CoreDataHelper.shared.context.fetch(request) as? [Progress]
-            for obj in results ?? [] {
-                CoreDataHelper.shared.deleteFromStore(obj)
-            }
-        } catch {
-            print("\n\n\nCould nnot delete progresses! \n\n\n")
-        }
-    }
 }
diff --git a/Stepic/Legacy/Model/Entities/Section/Section+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Section/Section+CoreDataProperties.swift
index 644e5cf8fe..7c3a84f538 100644
--- a/Stepic/Legacy/Model/Entities/Section/Section+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Section/Section+CoreDataProperties.swift
@@ -40,6 +40,10 @@ extension Section {
         NSEntityDescription.entity(forEntityName: "Section", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Section> {
+        NSFetchRequest<Section>(entityName: "Section")
+    }
+
     convenience init() {
         self.init(entity: Section.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Step/Step+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Step/Step+CoreDataProperties.swift
index 5fa01dab59..0f48645fcd 100644
--- a/Stepic/Legacy/Model/Entities/Step/Step+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Step/Step+CoreDataProperties.swift
@@ -38,6 +38,10 @@ extension Step {
         NSEntityDescription.entity(forEntityName: "Step", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Step> {
+        NSFetchRequest<Step>(entityName: "Step")
+    }
+
     convenience init() {
         self.init(entity: Step.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/StepOptions/StepOptions+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/StepOptions/StepOptions+CoreDataProperties.swift
index f7014e8ec9..dac79c738a 100644
--- a/Stepic/Legacy/Model/Entities/StepOptions/StepOptions+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/StepOptions/StepOptions+CoreDataProperties.swift
@@ -22,6 +22,10 @@ extension StepOptions {
         NSEntityDescription.entity(forEntityName: "StepOptions", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<StepOptions> {
+        NSFetchRequest<StepOptions>(entityName: "StepOptions")
+    }
+
     convenience init() {
         self.init(entity: StepOptions.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/Submission/SubmissionEntity+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Submission/SubmissionEntity+CoreDataProperties.swift
index 35ec857889..421b6d6a45 100644
--- a/Stepic/Legacy/Model/Entities/Submission/SubmissionEntity+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Submission/SubmissionEntity+CoreDataProperties.swift
@@ -19,7 +19,7 @@ extension SubmissionEntity {
         [NSSortDescriptor(key: #keyPath(managedID), ascending: false)]
     }
 
-    static func fetchRequest() -> NSFetchRequest<SubmissionEntity> {
+    static var fetchRequest: NSFetchRequest<SubmissionEntity> {
         NSFetchRequest<SubmissionEntity>(entityName: "SubmissionEntity")
     }
 }
diff --git a/Stepic/Legacy/Model/Entities/Unit/Unit+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Unit/Unit+CoreDataProperties.swift
index 781218a681..21ff3c67eb 100644
--- a/Stepic/Legacy/Model/Entities/Unit/Unit+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Unit/Unit+CoreDataProperties.swift
@@ -35,6 +35,10 @@ extension Unit {
         NSEntityDescription.entity(forEntityName: "Unit", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Unit> {
+        NSFetchRequest<Unit>(entityName: "Unit")
+    }
+
     convenience init() {
         self.init(entity: Unit.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/User/User+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/User/User+CoreDataProperties.swift
index f63fdd5249..bc0608bb3a 100644
--- a/Stepic/Legacy/Model/Entities/User/User+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/User/User+CoreDataProperties.swift
@@ -30,12 +30,13 @@ extension User {
     @NSManaged var managedAttempts: NSSet?
 
     @NSManaged var managedProfileEntity: Profile?
+    @NSManaged var managedUserCourse: UserCourse?
 
     static var defaultSortDescriptors: [NSSortDescriptor] {
         [NSSortDescriptor(key: #keyPath(managedId), ascending: false)]
     }
 
-    static func fetchRequest() -> NSFetchRequest<User> {
+    static var fetchRequest: NSFetchRequest<User> {
         NSFetchRequest<User>(entityName: "User")
     }
 
@@ -174,6 +175,15 @@ extension User {
         }
     }
 
+    var userCourse: UserCourse? {
+        get {
+            self.managedUserCourse
+        }
+        set {
+            self.managedUserCourse = newValue
+        }
+    }
+
     var authoredCourses: [Course] {
         get {
              self.managedAuthoredCourses?.allObjects as! [Course]
diff --git a/Stepic/Legacy/Model/Entities/UserActivity/UserActivityEntity+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/UserActivity/UserActivityEntity+CoreDataProperties.swift
index a03cf546ea..fe81eeca21 100644
--- a/Stepic/Legacy/Model/Entities/UserActivity/UserActivityEntity+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/UserActivity/UserActivityEntity+CoreDataProperties.swift
@@ -11,7 +11,7 @@ extension UserActivityEntity {
         [NSSortDescriptor(key: #keyPath(managedId), ascending: false)]
     }
 
-    static func fetchRequest() -> NSFetchRequest<UserActivityEntity> {
+    static var fetchRequest: NSFetchRequest<UserActivityEntity> {
         NSFetchRequest<UserActivityEntity>(entityName: "UserActivityEntity")
     }
 
diff --git a/Stepic/Legacy/Model/Entities/UserCourse/UserCourse+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/UserCourse/UserCourse+CoreDataProperties.swift
new file mode 100644
index 0000000000..9ec4d1429d
--- /dev/null
+++ b/Stepic/Legacy/Model/Entities/UserCourse/UserCourse+CoreDataProperties.swift
@@ -0,0 +1,114 @@
+import CoreData
+import Foundation
+
+extension UserCourse {
+    @NSManaged var managedId: NSNumber?
+    @NSManaged var managedUserId: NSNumber?
+    @NSManaged var managedCourseId: NSNumber?
+    @NSManaged var managedIsFavorite: NSNumber?
+    @NSManaged var managedIsPinned: NSNumber?
+    @NSManaged var managedIsArchived: NSNumber?
+    @NSManaged var managedLastViewed: Date?
+
+    @NSManaged var managedUser: User?
+    @NSManaged var managedCourse: Course?
+
+    static var oldEntity: NSEntityDescription {
+        NSEntityDescription.entity(forEntityName: "UserCourse", in: CoreDataHelper.shared.context)!
+    }
+
+    static var defaultSortDescriptors: [NSSortDescriptor] {
+        [NSSortDescriptor(key: #keyPath(managedId), ascending: false)]
+    }
+
+    static var fetchRequest: NSFetchRequest<UserCourse> {
+        NSFetchRequest<UserCourse>(entityName: "UserCourse")
+    }
+
+    static var observableKeys: Set<String> = ["managedIsFavorite", "managedIsArchived", "managedCourse"]
+
+    convenience init() {
+        self.init(entity: Self.oldEntity, insertInto: CoreDataHelper.shared.context)
+    }
+
+    var id: Int {
+        get {
+            self.managedId?.intValue ?? 0
+        }
+        set {
+            self.managedId = NSNumber(value: newValue)
+        }
+    }
+
+    var userID: Int {
+        get {
+            self.managedUserId?.intValue ?? 0
+        }
+        set {
+            self.managedUserId = NSNumber(value: newValue)
+        }
+    }
+
+    var courseID: Int {
+        get {
+            self.managedCourseId?.intValue ?? 0
+        }
+        set {
+            self.managedCourseId = NSNumber(value: newValue)
+        }
+    }
+
+    var isFavorite: Bool {
+        get {
+            self.managedIsFavorite?.boolValue ?? false
+        }
+        set {
+            self.managedIsFavorite = NSNumber(value: newValue)
+        }
+    }
+
+    var isPinned: Bool {
+        get {
+            self.managedIsPinned?.boolValue ?? false
+        }
+        set {
+            self.managedIsPinned = NSNumber(value: newValue)
+        }
+    }
+
+    var isArchived: Bool {
+        get {
+            self.managedIsArchived?.boolValue ?? false
+        }
+        set {
+            self.managedIsArchived = NSNumber(value: newValue)
+        }
+    }
+
+    var lastViewed: Date {
+        get {
+            self.managedLastViewed ?? Date()
+        }
+        set {
+            self.managedLastViewed = newValue
+        }
+    }
+
+    var course: Course? {
+        get {
+            self.managedCourse
+        }
+        set {
+            self.managedCourse = newValue
+        }
+    }
+
+    var user: User? {
+        get {
+            self.managedUser
+        }
+        set {
+            self.managedUser = newValue
+        }
+    }
+}
diff --git a/Stepic/Legacy/Model/Entities/UserCourse/UserCourse.swift b/Stepic/Legacy/Model/Entities/UserCourse/UserCourse.swift
new file mode 100644
index 0000000000..9a08c21d58
--- /dev/null
+++ b/Stepic/Legacy/Model/Entities/UserCourse/UserCourse.swift
@@ -0,0 +1,62 @@
+import CoreData
+import Foundation
+import SwiftyJSON
+
+final class UserCourse: NSManagedObject, JSONSerializable, IDFetchable {
+    typealias IdType = Int
+
+    var json: JSON {
+        [
+            JSONKey.isFavorite.rawValue: self.isFavorite,
+            JSONKey.isArchived.rawValue: self.isArchived,
+            JSONKey.course.rawValue: self.courseID
+        ]
+    }
+
+    required convenience init(json: JSON) {
+        self.init()
+        self.update(json: json)
+        NotificationCenter.default.post(name: .userCourseDidCreateNotification, object: self)
+    }
+
+    func update(json: JSON) {
+        self.id = json[JSONKey.id.rawValue].intValue
+        self.userID = json[JSONKey.user.rawValue].intValue
+        self.courseID = json[JSONKey.course.rawValue].intValue
+        self.isFavorite = json[JSONKey.isFavorite.rawValue].boolValue
+        self.isArchived = json[JSONKey.isArchived.rawValue].boolValue
+        self.lastViewed = Parser.shared.dateFromTimedateJSON(json[JSONKey.lastViewed.rawValue]) ?? Date()
+    }
+
+    func hasEqualId(json: JSON) -> Bool {
+        self.id == json[JSONKey.id.rawValue].int
+    }
+
+    override func prepareForDeletion() {
+        super.prepareForDeletion()
+        NotificationCenter.default.post(name: .userCourseDidDeleteNotification, object: self)
+    }
+
+    override func didChangeValue(forKey key: String) {
+        super.didChangeValue(forKey: key)
+
+        if Self.observableKeys.contains(key) {
+            NotificationCenter.default.post(name: .userCourseDidChangeNotification, object: self)
+        }
+    }
+
+    enum JSONKey: String {
+        case id
+        case user
+        case course
+        case isFavorite = "is_favorite"
+        case isArchived = "is_archived"
+        case lastViewed = "last_viewed"
+    }
+}
+
+extension Foundation.Notification.Name {
+    static let userCourseDidChangeNotification = NSNotification.Name("userCourseDidChangeNotification")
+    static let userCourseDidCreateNotification = NSNotification.Name("userCourseDidCreateNotification")
+    static let userCourseDidDeleteNotification = NSNotification.Name("userCourseDidDeleteNotification")
+}
diff --git a/Stepic/Legacy/Model/Entities/Video/Video+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/Video/Video+CoreDataProperties.swift
index b879ca1d15..e4b4e05a80 100644
--- a/Stepic/Legacy/Model/Entities/Video/Video+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/Video/Video+CoreDataProperties.swift
@@ -26,6 +26,10 @@ extension Video {
         NSEntityDescription.entity(forEntityName: "Video", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<Video> {
+        NSFetchRequest<Video>(entityName: "Video")
+    }
+
     convenience init() {
         self.init(entity: Video.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Entities/VideoURL/VideoURL+CoreDataProperties.swift b/Stepic/Legacy/Model/Entities/VideoURL/VideoURL+CoreDataProperties.swift
index 95f735dc4d..1b3052deb0 100644
--- a/Stepic/Legacy/Model/Entities/VideoURL/VideoURL+CoreDataProperties.swift
+++ b/Stepic/Legacy/Model/Entities/VideoURL/VideoURL+CoreDataProperties.swift
@@ -21,6 +21,10 @@ extension VideoURL {
         NSEntityDescription.entity(forEntityName: "VideoURL", in: CoreDataHelper.shared.context)!
     }
 
+    static var fetchRequest: NSFetchRequest<VideoURL> {
+        NSFetchRequest<VideoURL>(entityName: "VideoURL")
+    }
+
     convenience init() {
         self.init(entity: VideoURL.oldEntity, insertInto: CoreDataHelper.shared.context)
     }
diff --git a/Stepic/Legacy/Model/Model.xcdatamodeld/.xccurrentversion b/Stepic/Legacy/Model/Model.xcdatamodeld/.xccurrentversion
index f7943d6d03..ffe0b388a4 100644
--- a/Stepic/Legacy/Model/Model.xcdatamodeld/.xccurrentversion
+++ b/Stepic/Legacy/Model/Model.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Model_user_courses_actions_v51.xcdatamodel</string>
+	<string>Model_user_courses_v52.xcdatamodel</string>
 </dict>
 </plist>
diff --git a/Stepic/Legacy/Model/Model.xcdatamodeld/Model_user_courses_v52.xcdatamodel/contents b/Stepic/Legacy/Model/Model.xcdatamodeld/Model_user_courses_v52.xcdatamodel/contents
new file mode 100644
index 0000000000..c9f4ead86c
--- /dev/null
+++ b/Stepic/Legacy/Model/Model.xcdatamodeld/Model_user_courses_v52.xcdatamodel/contents
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19F101" minimumToolsVersion="Xcode 7.0" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Assignment" representedClassName=".Assignment" syncable="YES">
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedStepId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedUnitId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedUnit" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Unit" inverseName="managedAssignments" inverseEntity="Unit" syncable="YES"/>
+    </entity>
+    <entity name="AttemptEntity" representedClassName=".AttemptEntity" syncable="YES">
+        <attribute name="managedDataset" optional="YES" attributeType="Transformable" customClassName=".Dataset" syncable="YES"/>
+        <attribute name="managedDatasetURL" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedID" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedStatus" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedStepID" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedTime" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedTimeLeft" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedUserID" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedStep" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Step" inverseName="managedAttempt" inverseEntity="Step" syncable="YES"/>
+        <relationship name="managedSubmission" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SubmissionEntity" inverseName="managedAttempt" inverseEntity="SubmissionEntity" syncable="YES"/>
+        <relationship name="managedUser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="managedAttempts" inverseEntity="User" syncable="YES"/>
+    </entity>
+    <entity name="Block" representedClassName=".Block" syncable="YES">
+        <attribute name="managedName" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedText" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedStep" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Step" inverseName="managedBlock" inverseEntity="Step" syncable="YES"/>
+        <relationship name="managedVideo" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="Video" inverseName="managedBlock" inverseEntity="Video" syncable="YES"/>
+    </entity>
+    <entity name="Certificate" representedClassName=".Certificate" syncable="YES">
+        <attribute name="managedCourseId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedGrade" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedisPublic" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIssueDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedType" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedUpdateDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedURL" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedUserId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Course" inverseName="managedCertificateEntity" inverseEntity="Course" syncable="YES"/>
+    </entity>
+    <entity name="CodeLimit" representedClassName=".CodeLimit" syncable="YES">
+        <attribute name="managedLanguage" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedMemory" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedTime" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedOptions" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StepOptions" inverseName="managedLimits" inverseEntity="StepOptions" syncable="YES"/>
+    </entity>
+    <entity name="CodeSample" representedClassName=".CodeSample" syncable="YES">
+        <attribute name="managedInput" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedOutput" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedOptions" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StepOptions" inverseName="managedSamples" inverseEntity="StepOptions" syncable="YES"/>
+    </entity>
+    <entity name="CodeTemplate" representedClassName=".CodeTemplate" syncable="YES">
+        <attribute name="managedIsUserGenerated" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLanguage" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedTemplateString" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedOptions" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StepOptions" inverseName="managedTemplates" inverseEntity="StepOptions" syncable="YES"/>
+    </entity>
+    <entity name="Course" representedClassName=".Course" syncable="YES">
+        <attribute name="managedAudience" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedAuthorsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedBeginDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedCertificate" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedCertificateDistinctionThreshold" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedCertificateRegularThreshold" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedCourseDescription" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedDisplayPrice" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedEndDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedEnrolled" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedFeatured" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedFormat" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedImageURL" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedInstructorsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedIntroURL" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedIsArchived" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsCertificateAutoIssued" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsCertificateIssued" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsFavorite" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsPaid" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLanguageCode" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedLastStepId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedLearnersCount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedProgressId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedPublic" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedReadiness" optional="YES" attributeType="Float" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedRequirements" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedReviewSummaryId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedScheduleType" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedSectionsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedSlug" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedSummary" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedTimeToComplete" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedTitle" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedTotalUnits" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedWorkload" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedAuthors" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="User" inverseName="managedAuthoredCourses" inverseEntity="User" syncable="YES"/>
+        <relationship name="managedCertificateEntity" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Certificate" inverseName="managedCourse" inverseEntity="Certificate" syncable="YES"/>
+        <relationship name="managedInstructors" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="User" inverseName="managedInstructedCourses" inverseEntity="User" syncable="YES"/>
+        <relationship name="managedIntroVideo" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Video" syncable="YES"/>
+        <relationship name="managedLastCodeLanguage" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="LastCodeLanguage" inverseName="managedCourse" inverseEntity="LastCodeLanguage" syncable="YES"/>
+        <relationship name="managedLastStep" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="LastStep" inverseName="managedCourse" inverseEntity="LastStep" syncable="YES"/>
+        <relationship name="managedProgress" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Progress" inverseName="managedCourse" inverseEntity="Progress" syncable="YES"/>
+        <relationship name="managedReviewSummary" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="CourseReviewSummary" inverseName="managedCourse" inverseEntity="CourseReviewSummary" syncable="YES"/>
+        <relationship name="managedSections" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="Section" inverseName="managedCourse" inverseEntity="Section" syncable="YES"/>
+        <relationship name="managedUserCourse" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="UserCourse" inverseName="managedCourse" inverseEntity="UserCourse" syncable="YES"/>
+    </entity>
+    <entity name="CourseList" representedClassName=".CourseListModel" syncable="YES">
+        <attribute name="managedCoursesArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedDescription" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLanguage" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedPosition" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedTitle" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="CourseReview" representedClassName=".CourseReview" syncable="YES">
+        <attribute name="managedCourseId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedCreateDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedScore" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedText" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedUserId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="No Action" destinationEntity="Course" syncable="YES"/>
+        <relationship name="managedUser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" syncable="YES"/>
+    </entity>
+    <entity name="CourseReviewSummary" representedClassName=".CourseReviewSummary" syncable="YES">
+        <attribute name="managedAverage" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedCount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedDistribution" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Course" inverseName="managedReviewSummary" inverseEntity="Course" syncable="YES"/>
+    </entity>
+    <entity name="DiscussionThread" representedClassName=".DiscussionThread" syncable="YES">
+        <attribute name="managedDiscussionProxy" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedDiscussionsCount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedThread" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedStep" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Step" inverseName="managedDiscussionThreads" inverseEntity="Step" syncable="YES"/>
+    </entity>
+    <entity name="EmailAddress" representedClassName=".EmailAddress" syncable="YES">
+        <attribute name="managedEmail" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsPrimary" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsVerified" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedUserId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedProfile" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Profile" inverseName="managedEmailAddresses" inverseEntity="Profile" syncable="YES"/>
+    </entity>
+    <entity name="LastCodeLanguage" representedClassName=".LastCodeLanguage" syncable="YES">
+        <attribute name="managedLanguage" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Course" inverseName="managedLastCodeLanguage" inverseEntity="Course" syncable="YES"/>
+    </entity>
+    <entity name="LastStep" representedClassName=".LastStep" syncable="YES">
+        <attribute name="managedId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedStepId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedUnitId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Course" inverseName="managedLastStep" inverseEntity="Course" syncable="YES"/>
+    </entity>
+    <entity name="Lesson" representedClassName=".Lesson" syncable="YES">
+        <attribute name="managedCanEdit" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedCoverURL" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedFeatured" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPassedBy" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPublic" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedSlug" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedStepsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedTimeToComplete" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedTitle" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedVoteDelta" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedSteps" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="Step" inverseName="managedLesson" inverseEntity="Step" syncable="YES"/>
+        <relationship name="managedUnit" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Unit" inverseName="managedLesson" inverseEntity="Unit" syncable="YES"/>
+    </entity>
+    <entity name="Notification" representedClassName=".Notification" syncable="YES">
+        <attribute name="managedAction" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedHtmlText" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsFavorite" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsMuted" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLevel" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedPriority" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedStatus" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedTime" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedType" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="Profile" representedClassName=".Profile" syncable="YES">
+        <attribute name="managedDetails" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedEmailAddressesArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedFirstName" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsStaff" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLastName" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedShortBio" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedSubscribedForMail" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedEmailAddresses" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="EmailAddress" inverseName="managedProfile" inverseEntity="EmailAddress" syncable="YES"/>
+        <relationship name="managedUser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="managedProfileEntity" inverseEntity="User" syncable="YES"/>
+        <relationship name="managedUserActivity" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="UserActivityEntity" inverseName="managedProfile" inverseEntity="UserActivityEntity" syncable="YES"/>
+    </entity>
+    <entity name="Progress" representedClassName=".Progress" syncable="YES">
+        <attribute name="managedCost" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedIsPassed" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLastViewed" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedNumberOfSteps" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedNumberOfStepsPassed" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedScore" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Course" inverseName="managedProgress" inverseEntity="Course" syncable="YES"/>
+        <relationship name="managedSection" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Section" inverseName="managedProgress" inverseEntity="Section" syncable="YES"/>
+        <relationship name="managedStep" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Step" inverseName="managedProgress" inverseEntity="Step" syncable="YES"/>
+        <relationship name="managedUnit" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Unit" inverseName="managedProgress" inverseEntity="Unit" syncable="YES"/>
+    </entity>
+    <entity name="Section" representedClassName=".Section" syncable="YES">
+        <attribute name="managedActive" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedBeginDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedCourseId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedDiscountingPolicy" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedEndDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedHardDeadline" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsCached" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsExam" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsRequirementSatisfied" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPosition" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedProgressId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedRequiredPercent" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedRequiredSectionID" optional="YES" attributeType="Integer 64" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedSoftDeadline" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedTestSectionAction" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedTitle" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedUnitsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Course" inverseName="managedSections" inverseEntity="Course" syncable="YES"/>
+        <relationship name="managedProgress" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Progress" inverseName="managedSection" inverseEntity="Progress" syncable="YES"/>
+        <relationship name="managedUnits" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="Unit" inverseName="managedSection" inverseEntity="Unit" syncable="YES"/>
+    </entity>
+    <entity name="Step" representedClassName=".Step" syncable="YES">
+        <attribute name="managedCorrectRatio" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedDiscussionProxy" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedDiscussionsCount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedDiscussionThreadsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedHasSubmissionRestrictions" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLessonId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedMaxSubmissionsCount" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPassedBy" optional="YES" attributeType="Integer 64" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPosition" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedProgressId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedStatus" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedAttempt" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="AttemptEntity" inverseName="managedStep" inverseEntity="AttemptEntity" syncable="YES"/>
+        <relationship name="managedBlock" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="Block" inverseName="managedStep" inverseEntity="Block" syncable="YES"/>
+        <relationship name="managedDiscussionThreads" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="DiscussionThread" inverseName="managedStep" inverseEntity="DiscussionThread" syncable="YES"/>
+        <relationship name="managedLesson" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Lesson" inverseName="managedSteps" inverseEntity="Lesson" syncable="YES"/>
+        <relationship name="managedOptions" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="StepOptions" inverseName="managedStep" inverseEntity="StepOptions" syncable="YES"/>
+        <relationship name="managedProgress" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Progress" inverseName="managedStep" inverseEntity="Progress" syncable="YES"/>
+    </entity>
+    <entity name="StepOptions" representedClassName=".StepOptions" syncable="YES">
+        <attribute name="managedExecutionMemoryLimit" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedExecutionTimeLimit" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsRunUserCodeAllowed" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedLimits" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="CodeLimit" inverseName="managedOptions" inverseEntity="CodeLimit" syncable="YES"/>
+        <relationship name="managedSamples" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="CodeSample" inverseName="managedOptions" inverseEntity="CodeSample" syncable="YES"/>
+        <relationship name="managedStep" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Step" inverseName="managedOptions" inverseEntity="Step" syncable="YES"/>
+        <relationship name="managedTemplates" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="CodeTemplate" inverseName="managedOptions" inverseEntity="CodeTemplate" syncable="YES"/>
+    </entity>
+    <entity name="SubmissionEntity" representedClassName=".SubmissionEntity" syncable="YES">
+        <attribute name="managedAttemptID" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedFeedback" optional="YES" attributeType="Transformable" customClassName=".SubmissionFeedback" syncable="YES"/>
+        <attribute name="managedHint" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedID" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLocal" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedReply" optional="YES" attributeType="Transformable" customClassName=".Reply" syncable="YES"/>
+        <attribute name="managedStatus" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedTime" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedAttempt" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="AttemptEntity" inverseName="managedSubmission" inverseEntity="AttemptEntity" syncable="YES"/>
+    </entity>
+    <entity name="Unit" representedClassName=".Unit" syncable="YES">
+        <attribute name="managedActive" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedAssignmentsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="managedBeginDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedHardDeadline" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLessonId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPosition" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedProgressId" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedSectionId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedSoftDeadline" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedAssignments" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="Assignment" inverseName="managedUnit" inverseEntity="Assignment" syncable="YES"/>
+        <relationship name="managedLesson" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Lesson" inverseName="managedUnit" inverseEntity="Lesson" syncable="YES"/>
+        <relationship name="managedProgress" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="Progress" inverseName="managedUnit" inverseEntity="Progress" syncable="YES"/>
+        <relationship name="managedSection" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Section" inverseName="managedUnits" inverseEntity="Section" syncable="YES"/>
+    </entity>
+    <entity name="User" representedClassName=".User" syncable="YES">
+        <attribute name="managedAvatarURL" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedBio" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedDetails" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedFirstName" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedJoinDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLastName" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedLevel" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedOrganization" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPrivate" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedProfile" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedAttempts" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="AttemptEntity" inverseName="managedUser" inverseEntity="AttemptEntity" syncable="YES"/>
+        <relationship name="managedAuthoredCourses" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Course" inverseName="managedAuthors" inverseEntity="Course" syncable="YES"/>
+        <relationship name="managedInstructedCourses" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Course" inverseName="managedInstructors" inverseEntity="Course" syncable="YES"/>
+        <relationship name="managedProfileEntity" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Profile" inverseName="managedUser" inverseEntity="Profile" syncable="YES"/>
+        <relationship name="managedUserCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="UserCourse" inverseName="managedUser" inverseEntity="UserCourse" syncable="YES"/>
+    </entity>
+    <entity name="UserActivityEntity" representedClassName=".UserActivityEntity" syncable="YES">
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPinsArray" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <relationship name="managedProfile" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Profile" inverseName="managedUserActivity" inverseEntity="Profile" syncable="YES"/>
+    </entity>
+    <entity name="UserCourse" representedClassName=".UserCourse" syncable="YES">
+        <attribute name="managedCourseId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsArchived" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsFavorite" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedIsPinned" optional="YES" attributeType="Boolean" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedLastViewed" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedUserId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <relationship name="managedCourse" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Course" inverseName="managedUserCourse" inverseEntity="Course" syncable="YES"/>
+        <relationship name="managedUser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="managedUserCourse" inverseEntity="User" syncable="YES"/>
+    </entity>
+    <entity name="Video" representedClassName=".Video" syncable="YES">
+        <attribute name="managedCachedPath" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedCachedQuality" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedId" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedPlayTime" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="managedStatus" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedThumbnailURL" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedBlock" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Block" inverseName="managedVideo" inverseEntity="Block" syncable="YES"/>
+        <relationship name="managedURLs" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="VideoURL" inverseName="managedVideo" inverseEntity="VideoURL" syncable="YES"/>
+    </entity>
+    <entity name="VideoURL" representedClassName=".VideoURL" syncable="YES">
+        <attribute name="managedQuality" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="managedURL" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="managedVideo" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Video" inverseName="managedURLs" inverseEntity="Video" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Assignment" positionX="182.73046875" positionY="260.6640625" width="128" height="105"/>
+        <element name="AttemptEntity" positionX="-450" positionY="-234" width="128" height="208"/>
+        <element name="Block" positionX="-85.77734375" positionY="236.91796875" width="128" height="105"/>
+        <element name="Certificate" positionX="-372.0390625" positionY="364.015625" width="128" height="195"/>
+        <element name="CodeLimit" positionX="-286.51171875" positionY="-387.5234375" width="128" height="105"/>
+        <element name="CodeSample" positionX="-651.484375" positionY="-311.640625" width="128" height="90"/>
+        <element name="CodeTemplate" positionX="-492.8984375" positionY="-359.9921875" width="128" height="105"/>
+        <element name="Course" positionX="-594.50390625" positionY="49.8359375" width="128" height="748"/>
+        <element name="CourseList" positionX="-14.1953125" positionY="793.859375" width="128" height="135"/>
+        <element name="CourseReview" positionX="-441" positionY="-234" width="128" height="165"/>
+        <element name="CourseReviewSummary" positionX="-389.45703125" positionY="795.01171875" width="128" height="120"/>
+        <element name="DiscussionThread" positionX="-450" positionY="-234" width="128" height="118"/>
+        <element name="EmailAddress" positionX="-450" positionY="-234" width="128" height="135"/>
+        <element name="LastCodeLanguage" positionX="-450" positionY="-234" width="128" height="75"/>
+        <element name="LastStep" positionX="-361.27734375" positionY="646.40625" width="128" height="105"/>
+        <element name="Lesson" positionX="-201.69140625" positionY="-66.22265625" width="128" height="240"/>
+        <element name="Notification" positionX="-208.453125" positionY="793.484375" width="128" height="195"/>
+        <element name="Profile" positionX="-547.68359375" positionY="-119.4140625" width="128" height="208"/>
+        <element name="Progress" positionX="210.40234375" positionY="32.89453125" width="128" height="210"/>
+        <element name="Section" positionX="-88.1484375" positionY="379.60546875" width="128" height="28"/>
+        <element name="Step" positionX="76.40625" positionY="-309.26953125" width="128" height="28"/>
+        <element name="StepOptions" positionX="-301.69921875" positionY="-199.52734375" width="128" height="148"/>
+        <element name="SubmissionEntity" positionX="-441" positionY="-225" width="128" height="178"/>
+        <element name="Unit" positionX="396.875" positionY="76.44140625" width="128" height="255"/>
+        <element name="User" positionX="-368.4296875" positionY="90.0234375" width="128" height="283"/>
+        <element name="UserActivityEntity" positionX="-450" positionY="-234" width="128" height="88"/>
+        <element name="UserCourse" positionX="-450" positionY="-234" width="128" height="178"/>
+        <element name="Video" positionX="259.9609375" positionY="505.1015625" width="128" height="165"/>
+        <element name="VideoURL" positionX="445.92578125" positionY="580.05078125" width="128" height="90"/>
+    </elements>
+</model>
\ No newline at end of file
diff --git a/Stepic/Legacy/Model/Network/Endpoints/UserCoursesAPI.swift b/Stepic/Legacy/Model/Network/Endpoints/UserCoursesAPI.swift
index 2b126d58b4..049285e7e7 100644
--- a/Stepic/Legacy/Model/Network/Endpoints/UserCoursesAPI.swift
+++ b/Stepic/Legacy/Model/Network/Endpoints/UserCoursesAPI.swift
@@ -9,10 +9,20 @@
 import Alamofire
 import Foundation
 import PromiseKit
+import SwiftyJSON
 
 final class UserCoursesAPI: APIEndpoint {
     override var name: String { "user-courses" }
 
+    private let userCoursesPersistenceService: UserCoursesPersistenceServiceProtocol
+
+    init(
+        userCoursesPersistenceService: UserCoursesPersistenceServiceProtocol = UserCoursesPersistenceService()
+    ) {
+        self.userCoursesPersistenceService = userCoursesPersistenceService
+        super.init()
+    }
+
     func retrieve(
         page: Int = 1,
         isArchived: Bool? = nil,
@@ -29,13 +39,17 @@ final class UserCoursesAPI: APIEndpoint {
                 params[UserCourse.JSONKey.isFavorite.rawValue] = String(isFavorite)
             }
 
-            self.retrieve.request(
-                requestEndpoint: self.name,
-                paramName: self.name,
-                params: params,
-                updatingObjects: [UserCourse](),
-                withManager: self.manager
-            ).done { userCourses, meta, _ in
+            firstly { () -> Guarantee<[UserCourse]> in
+                self.userCoursesPersistenceService.fetchAll()
+            }.then { cachedUserCourses -> Promise<([UserCourse], Meta, JSON)> in
+                self.retrieve.request(
+                    requestEndpoint: self.name,
+                    paramName: self.name,
+                    params: params,
+                    updatingObjects: cachedUserCourses,
+                    withManager: self.manager
+                )
+            }.done { userCourses, meta, _ in
                 seal.fulfill((userCourses, meta))
             }.catch { error in
                 seal.reject(error)
@@ -48,12 +62,17 @@ final class UserCoursesAPI: APIEndpoint {
             var params = Parameters()
             params["course"] = courseID
 
-            self.retrieve.request(
-                requestEndpoint: self.name,
-                paramName: self.name,
-                params: params,
-                withManager: self.manager
-            ).done { userCourses, meta, _ in
+            firstly { () -> Guarantee<[UserCourse]> in
+                self.userCoursesPersistenceService.fetch(courseID: courseID)
+            }.then { cachedUserCourses -> Promise<([UserCourse], Meta, JSON)> in
+                self.retrieve.request(
+                    requestEndpoint: self.name,
+                    paramName: self.name,
+                    params: params,
+                    updatingObjects: cachedUserCourses,
+                    withManager: self.manager
+                )
+            }.done { userCourses, meta, _ in
                 seal.fulfill((userCourses, meta))
             }.catch { error in
                 seal.reject(error)
diff --git a/Stepic/Legacy/Model/Notifications/DeviceDefaults.swift b/Stepic/Legacy/Model/Notifications/DeviceDefaults.swift
index 1c079cb3d4..fc93a5d965 100644
--- a/Stepic/Legacy/Model/Notifications/DeviceDefaults.swift
+++ b/Stepic/Legacy/Model/Notifications/DeviceDefaults.swift
@@ -11,6 +11,7 @@ import Foundation
 /*
  Stores and manages information about device defaults
  */
+@available(*, deprecated, message: "Legacy class")
 final class DeviceDefaults {
     private init() {}
     static let sharedDefaults = DeviceDefaults()
diff --git a/Stepic/Legacy/Model/StepikSession/AuthInfo.swift b/Stepic/Legacy/Model/StepikSession/AuthInfo.swift
index fe2c44046c..5b62b87818 100644
--- a/Stepic/Legacy/Model/StepikSession/AuthInfo.swift
+++ b/Stepic/Legacy/Model/StepikSession/AuthInfo.swift
@@ -14,11 +14,14 @@ extension Foundation.Notification.Name {
     static let didLogin = Foundation.Notification.Name("didLogin")
 }
 
+@available(*, deprecated, message: "Legacy class")
 final class AuthInfo: NSObject {
     static var shared = AuthInfo()
 
     private let defaults = UserDefaults.standard
 
+    private lazy var logoutDataClearService: LogoutDataClearServiceProtocol = LogoutDataClearService()
+
     override private init() {
         super.init()
 
@@ -46,43 +49,14 @@ final class AuthInfo: NSObject {
         set(newToken) {
             if newToken == nil || newToken?.accessToken == "" {
                 print("\nsetting new token to nil\n")
-
-                let performLogoutActions = { [weak self] in
-                    guard let strongSelf = self else {
-                        return
-                    }
-
-                    DispatchQueue.main.async {
-                        //Delete enrolled information
-                        let c = Course.getAllCourses(enrolled: true)
-                        for course in c {
-                            course.enrolled = false
-                        }
-
-                        Certificate.deleteAll()
-                        Progress.deleteAllStoredProgresses()
-                        Notification.deleteAll()
-                        AnalyticsUserProperties.shared.clearUserDependentProperties()
-                        NotificationsBadgesManager.shared.set(number: 0)
-                        CoreDataHelper.shared.save()
-
-                        AuthInfo.shared.user = nil
-                        DeviceDefaults.sharedDefaults.deviceId = nil
-
-                        NotificationsService().removeAllLocalNotifications()
-                        SpotlightIndexingService.shared.deleteAllSearchableItems()
-
-                        strongSelf.setTokenValue(nil)
-                        NotificationCenter.default.post(name: .didLogout, object: nil)
-                    }
+                self.logoutDataClearService.clearCurrentUserData().done {
+                    self.user = nil
+                    self.setTokenValue(nil)
+                    NotificationCenter.default.post(name: .didLogout, object: nil)
                 }
-                // Unregister from notifications.
-                NotificationsRegistrationService().unregisterFromNotifications(completion: {
-                    performLogoutActions()
-                })
             } else {
                 let oldToken = token
-                print("\nsetting new token -> \(newToken!.accessToken)\n")
+                print("\nsetting new token -> \(String(describing: newToken?.accessToken))\n")
                 didRefresh = true
                 setTokenValue(newToken)
                 StepikSession.delete()
diff --git a/Stepic/Legacy/Model/UserCourse.swift b/Stepic/Legacy/Model/UserCourse.swift
deleted file mode 100644
index e34e22a5fa..0000000000
--- a/Stepic/Legacy/Model/UserCourse.swift
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-//  UserCourse.swift
-//  Stepic
-//
-//  Created by Vladislav Kiryukhin on 17.09.2018.
-//  Copyright © 2018 Alex Karpov. All rights reserved.
-//
-
-import Foundation
-import SwiftyJSON
-
-final class UserCourse: JSONSerializable {
-    var id: Int = 0
-    var userID: Int = 0
-    var courseID: Int = 0
-    var isFavorite: Bool = false
-    var isArchived: Bool = false
-    var lastViewed: Date = Date()
-
-    var json: JSON {
-        [
-            JSONKey.isFavorite.rawValue: self.isFavorite,
-            JSONKey.isArchived.rawValue: self.isArchived,
-            JSONKey.course.rawValue: self.courseID
-        ]
-    }
-
-    required init(json: JSON) {
-        self.update(json: json)
-    }
-
-    func update(json: JSON) {
-        self.id = json[JSONKey.id.rawValue].intValue
-        self.userID = json[JSONKey.user.rawValue].intValue
-        self.courseID = json[JSONKey.course.rawValue].intValue
-        self.isFavorite = json[JSONKey.isFavorite.rawValue].boolValue
-        self.isArchived = json[JSONKey.isArchived.rawValue].boolValue
-        self.lastViewed = Parser.shared.dateFromTimedateJSON(json[JSONKey.lastViewed.rawValue]) ?? Date()
-    }
-
-    enum JSONKey: String {
-        case id
-        case user
-        case course
-        case isFavorite = "is_favorite"
-        case isArchived = "is_archived"
-        case lastViewed = "last_viewed"
-    }
-}
diff --git a/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationService.swift b/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationService.swift
index 02265c3792..6f8e6b4105 100644
--- a/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationService.swift
+++ b/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationService.swift
@@ -302,40 +302,32 @@ final class NotificationsRegistrationService: NotificationsRegistrationServicePr
 
     // MARK: - Unregister -
 
-    @available(*, deprecated, message: "Legacy method with callbacks")
-    func unregisterFromNotifications(completion: @escaping (() -> Void)) {
-        self.unregisterFromNotifications().done {
-            completion()
-        }.catch { _ in
-        }
-    }
-
-    func unregisterFromNotifications() -> Guarantee<Void> {
+    func unregisterForRemoteNotifications() -> Guarantee<Void> {
         Guarantee { seal in
             UIApplication.shared.unregisterForRemoteNotifications()
 
-            if let deviceId = DeviceDefaults.sharedDefaults.deviceId {
-                ApiDataDownloader.devices.delete(deviceId).done { () in
-                    print("NotificationsRegistrationService: successfully delete device, id = \(deviceId)")
+            if let deviceID = DeviceDefaults.sharedDefaults.deviceId {
+                ApiDataDownloader.devices.delete(deviceID).done { () in
+                    print("NotificationsRegistrationService: successfully delete device, id = \(deviceID)")
                     seal(())
                 }.catch { error in
                     switch error {
                     case DeviceError.notFound:
-                        print("NotificationsRegistrationService: device not found on deletion, id = \(deviceId)")
+                        print("NotificationsRegistrationService: device not found on deletion, id = \(deviceID)")
                     default:
-                        if let userId = AuthInfo.shared.userId,
+                        if let userID = AuthInfo.shared.userId,
                            let token = AuthInfo.shared.token {
-                            let deleteTask = DeleteDeviceExecutableTask(userId: userId, deviceId: deviceId)
+                            let deleteTask = DeleteDeviceExecutableTask(userId: userID, deviceId: deviceID)
                             ExecutionQueues.sharedQueues.connectionAvailableExecutionQueue.push(deleteTask)
 
-                            let userPersistencyManager = PersistentUserTokenRecoveryManager(baseName: "Users")
-                            userPersistencyManager.writeStepicToken(token, userId: userId)
+                            let userPersistenceManager = PersistentUserTokenRecoveryManager(baseName: "Users")
+                            userPersistenceManager.writeStepicToken(token, userId: userID)
 
-                            let taskPersistencyManager = PersistentTaskRecoveryManager(baseName: "Tasks")
-                            taskPersistencyManager.writeTask(deleteTask, name: deleteTask.id)
+                            let taskPersistenceManager = PersistentTaskRecoveryManager(baseName: "Tasks")
+                            taskPersistenceManager.writeTask(deleteTask, name: deleteTask.id)
 
-                            let queuePersistencyManager = PersistentQueueRecoveryManager(baseName: "Queues")
-                            queuePersistencyManager.writeQueue(
+                            let queuePersistenceManager = PersistentQueueRecoveryManager(baseName: "Queues")
+                            queuePersistenceManager.writeQueue(
                                 ExecutionQueues.sharedQueues.connectionAvailableExecutionQueue,
                                 key: ExecutionQueues.sharedQueues.connectionAvailableExecutionQueueKey
                             )
@@ -362,7 +354,7 @@ extension NotificationsRegistrationService {
 
     private var didShowDefaultPermissionAlert: Bool {
         get {
-             UserDefaults.standard.bool(
+            UserDefaults.standard.bool(
                 forKey: NotificationsRegistrationService.didShowDefaultPermissionAlertKey
             )
         }
@@ -376,7 +368,7 @@ extension NotificationsRegistrationService {
 
     private var isFirstRegistrationIsInProgress: Bool {
         get {
-             UserDefaults.standard.bool(
+            UserDefaults.standard.bool(
                 forKey: NotificationsRegistrationService.isFirstRegistrationIsInProgressKey
             )
         }
diff --git a/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationServiceProtocol.swift b/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationServiceProtocol.swift
index c9a2f7baa3..d911fc14b7 100644
--- a/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationServiceProtocol.swift
+++ b/Stepic/Legacy/Services/Notifications/Registration/NotificationsRegistrationServiceProtocol.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import PromiseKit
 
 /// The centralized point for registration with Apple Push Notifications service (APNs).
 protocol NotificationsRegistrationServiceProtocol: AnyObject {
@@ -53,6 +54,9 @@ protocol NotificationsRegistrationServiceProtocol: AnyObject {
     ///   - registrationToken: An Firebase Messaging scoped token for the firebase app.
     ///   - forceCreation: Controls whether to create a new device instance or get cached one.
     func registerDevice(_ registrationToken: String, forceCreation: Bool)
+
+    /// Unregister for all remote notifications received via Apple Push Notification service.
+    func unregisterForRemoteNotifications() -> Guarantee<Void>
 }
 
 extension NotificationsRegistrationServiceProtocol {
diff --git a/Stepic/Sources/Common/Debouncer.swift b/Stepic/Sources/Common/Debouncer.swift
new file mode 100644
index 0000000000..0b9addbbdc
--- /dev/null
+++ b/Stepic/Sources/Common/Debouncer.swift
@@ -0,0 +1,45 @@
+import Foundation
+
+protocol DebouncerProtocol: AnyObject {
+    var action: (() -> Void)? { get set }
+
+    init(delay: Double)
+}
+
+final class Debouncer: DebouncerProtocol {
+    private static let defaultDelay: Double = 0.35
+
+    private let delay: Double
+    private weak var timer: Timer?
+
+    var action: (() -> Void)? {
+        didSet {
+            self.debounce()
+        }
+    }
+
+    init(delay: Double = Debouncer.defaultDelay) {
+        self.delay = delay
+    }
+
+    convenience init(delay: Double = Debouncer.defaultDelay, action: @escaping (() -> Void)) {
+        self.init(delay: delay)
+        self.action = action
+    }
+
+    private func debounce() {
+        self.timer?.invalidate()
+        self.timer = Timer.scheduledTimer(
+            timeInterval: self.delay,
+            target: self,
+            selector: #selector(self.executeAction(_:)),
+            userInfo: nil,
+            repeats: false
+        )
+    }
+
+    @objc
+    private func executeAction(_ sender: Timer) {
+        self.action?()
+    }
+}
diff --git a/Stepic/Sources/Common/ImageDataProvider.swift b/Stepic/Sources/Common/ImageDataProvider.swift
index 623c496875..c7310538a9 100644
--- a/Stepic/Sources/Common/ImageDataProvider.swift
+++ b/Stepic/Sources/Common/ImageDataProvider.swift
@@ -105,11 +105,11 @@ final class NukeImageDataProvider: ImageDataProvider {
     }
 
     var data: Data? {
-        guard let image = self.imageCache[self.imageRequest] else {
+        guard let imageContainer = self.imageCache[self.imageRequest] else {
             return nil
         }
 
-        return image.jpegData(compressionQuality: self.compressionQuality)
+        return imageContainer.image.jpegData(compressionQuality: self.compressionQuality)
     }
 
     var contentURL: URL? { self.imageRequest.urlRequest.url }
diff --git a/Stepic/Sources/Modules/CourseList/CourseListPresenter.swift b/Stepic/Sources/Modules/CourseList/CourseListPresenter.swift
index 7a517deb3c..f95e6551da 100644
--- a/Stepic/Sources/Modules/CourseList/CourseListPresenter.swift
+++ b/Stepic/Sources/Modules/CourseList/CourseListPresenter.swift
@@ -103,6 +103,14 @@ final class CourseListPresenter: CourseListPresenterProtocol {
             progressViewModel = self.makeProgressViewModel(progress: progress)
         }
 
+        var userCourseViewModel: CourseWidgetUserCourseViewModel?
+        if let userCourse = course.userCourse {
+            userCourseViewModel = CourseWidgetUserCourseViewModel(
+                isFavorite: userCourse.isFavorite,
+                isArchived: userCourse.isArchived
+            )
+        }
+
         var ratingLabelText: String?
         if let reviewsCount = course.reviewSummary?.count,
            let averageRating = course.reviewSummary?.average,
@@ -110,15 +118,19 @@ final class CourseListPresenter: CourseListPresenterProtocol {
             ratingLabelText = FormatterHelper.averageRating(averageRating)
         }
 
+        let certificateLabelText = course.hasCertificate ? NSLocalizedString("Certificate", comment: "") : nil
+
         return CourseWidgetViewModel(
             title: course.title,
             summary: summaryText,
             coverImageURL: URL(string: course.coverURLString),
             learnersLabelText: FormatterHelper.longNumber(course.learnersCount ?? 0),
             ratingLabelText: ratingLabelText,
+            certificateLabelText: certificateLabelText,
             isAdaptive: isAdaptive,
             isEnrolled: isAuthorized && course.enrolled,
             progress: progressViewModel,
+            userCourse: userCourseViewModel,
             uniqueIdentifier: uniqueIdentifier,
             courseID: course.id,
             viewSource: viewSource
diff --git a/Stepic/Sources/Modules/CourseList/CourseWidgetViewModel.swift b/Stepic/Sources/Modules/CourseList/CourseWidgetViewModel.swift
index 1cbe88734a..e6fdd6e645 100644
--- a/Stepic/Sources/Modules/CourseList/CourseWidgetViewModel.swift
+++ b/Stepic/Sources/Modules/CourseList/CourseWidgetViewModel.swift
@@ -5,15 +5,22 @@ struct CourseWidgetProgressViewModel {
     let progressLabelText: String
 }
 
+struct CourseWidgetUserCourseViewModel {
+    let isFavorite: Bool
+    let isArchived: Bool
+}
+
 struct CourseWidgetViewModel: UniqueIdentifiable {
     let title: String
     let summary: String
     let coverImageURL: URL?
     let learnersLabelText: String
     let ratingLabelText: String?
+    let certificateLabelText: String?
     let isAdaptive: Bool
     let isEnrolled: Bool
     let progress: CourseWidgetProgressViewModel?
+    let userCourse: CourseWidgetUserCourseViewModel?
     let uniqueIdentifier: UniqueIdentifierType
     let courseID: Course.IdType
     let viewSource: AnalyticsEvent.CourseViewSource
diff --git a/Stepic/Sources/Modules/CourseList/Interactor/CourseListDataBackUpdateService.swift b/Stepic/Sources/Modules/CourseList/Interactor/CourseListDataBackUpdateService.swift
index 09663a72fa..7e27651e09 100644
--- a/Stepic/Sources/Modules/CourseList/Interactor/CourseListDataBackUpdateService.swift
+++ b/Stepic/Sources/Modules/CourseList/Interactor/CourseListDataBackUpdateService.swift
@@ -16,6 +16,11 @@ protocol CourseListDataBackUpdateServiceDelegate: AnyObject {
         _ service: CourseListDataBackUpdateServiceProtocol,
         didInsertCourse course: Course
     )
+    /// Tells the delegate that the specified user course is updated.
+    func courseListDataBackUpdateService(
+        _ service: CourseListDataBackUpdateServiceProtocol,
+        didUpdateUserCourse userCourse: UserCourse
+    )
 }
 
 protocol CourseListDataBackUpdateServiceProtocol: AnyObject {
@@ -28,6 +33,12 @@ final class CourseListDataBackUpdateService: CourseListDataBackUpdateServiceProt
 
     weak var delegate: CourseListDataBackUpdateServiceDelegate?
 
+    private var isUserCoursesCourseListType: Bool {
+        self.courseListType is EnrolledCourseListType
+            || self.courseListType is FavoriteCourseListType
+            || self.courseListType is ArchivedCourseListType
+    }
+
     init(
         courseListType: CourseListType,
         dataBackUpdateService: DataBackUpdateServiceProtocol
@@ -48,27 +59,48 @@ extension CourseListDataBackUpdateService: DataBackUpdateServiceDelegate {
             return
         }
 
-        // If progress or enrollment state was updated then refresh course with data
-        if update.contains(.progress) || update.contains(.enrollment) {
+        // If progress state was updated then refresh course with data
+        if update.contains(.progress) {
             self.delegate?.courseListDataBackUpdateService(self, didUpdateCourse: course)
         }
 
+        if update.contains(.enrollment) {
+            self.handleCourse(course, didUpdateEnrollment: update)
+        }
+
         // If isArchived or isFavorite state was updated then handle specified update and refresh course list
         if update.contains(.courseIsArchived) || update.contains(.courseIsFavorite) {
-            self.handleUserCoursesCourseUpdate(update: update, course: course)
+            self.handleCourse(course, didUpdateUserCourses: update)
         }
     }
 
     func dataBackUpdateService(
         _ dataBackUpdateService: DataBackUpdateService,
         didReport refreshedTarget: DataBackUpdateTarget
-    ) {}
+    ) {
+        guard case .userCourse(let userCourse) = refreshedTarget else {
+            return
+        }
 
-    private func handleUserCoursesCourseUpdate(update: DataBackUpdateDescription, course: Course) {
-        let isUserCoursesCourseListType = self.courseListType is EnrolledCourseListType
-            || self.courseListType is FavoriteCourseListType
-            || self.courseListType is ArchivedCourseListType
-        guard isUserCoursesCourseListType else {
+        self.delegate?.courseListDataBackUpdateService(self, didUpdateUserCourse: userCourse)
+    }
+
+    // MARK: Private Helpers
+
+    private func handleCourse(_ course: Course, didUpdateEnrollment update: DataBackUpdateDescription) {
+        if self.isUserCoursesCourseListType {
+            if course.enrolled && self.courseListType is EnrolledCourseListType {
+                self.delegate?.courseListDataBackUpdateService(self, didInsertCourse: course)
+            } else {
+                self.delegate?.courseListDataBackUpdateService(self, didDeleteCourse: course)
+            }
+        } else {
+            self.delegate?.courseListDataBackUpdateService(self, didUpdateCourse: course)
+        }
+    }
+
+    private func handleCourse(_ course: Course, didUpdateUserCourses update: DataBackUpdateDescription) {
+        guard course.enrolled, self.isUserCoursesCourseListType else {
             return
         }
 
diff --git a/Stepic/Sources/Modules/CourseList/Interactor/CourseListInteractor.swift b/Stepic/Sources/Modules/CourseList/Interactor/CourseListInteractor.swift
index 6d363e0a72..96551d972c 100644
--- a/Stepic/Sources/Modules/CourseList/Interactor/CourseListInteractor.swift
+++ b/Stepic/Sources/Modules/CourseList/Interactor/CourseListInteractor.swift
@@ -361,4 +361,14 @@ extension CourseListInteractor: CourseListDataBackUpdateServiceDelegate {
         self.cacheCurrentCourses()
         self.refreshCourseList()
     }
+
+    func courseListDataBackUpdateService(
+        _ service: CourseListDataBackUpdateServiceProtocol,
+        didUpdateUserCourse userCourse: UserCourse
+    ) {
+        if let course = self.currentCourses.first(where: { $0.1.id == userCourse.courseID })?.1 {
+            self.updateCourseInCurrentCourses(course)
+            self.refreshCourseList()
+        }
+    }
 }
diff --git a/Stepic/Sources/Modules/CourseList/Provider/CourseListNetworkService.swift b/Stepic/Sources/Modules/CourseList/Provider/CourseListNetworkService.swift
index 2fe0419665..a073acbbef 100644
--- a/Stepic/Sources/Modules/CourseList/Provider/CourseListNetworkService.swift
+++ b/Stepic/Sources/Modules/CourseList/Provider/CourseListNetworkService.swift
@@ -61,6 +61,15 @@ final class UserCoursesCourseListNetworkService: BaseCourseListNetworkService, C
                     order: info.map { $0.courseID },
                     transform: { $0.id }
                 )
+
+                let userCourseByCourseID: [Course.IdType: UserCourse] = info.reduce(into: [:], { $0[$1.courseID] = $1 })
+                for course in orderedCourses {
+                    if let userCourse = userCourseByCourseID[course.id] {
+                        userCourse.course = course
+                    }
+                }
+                CoreDataHelper.shared.save()
+
                 seal.fulfill((orderedCourses, meta))
             }.catch { _ in
                 seal.reject(Error.fetchFailed)
diff --git a/Stepic/Sources/Modules/CourseList/Provider/CourseListTypes.swift b/Stepic/Sources/Modules/CourseList/Provider/CourseListTypes.swift
index 05aea8de37..0a12bbce47 100644
--- a/Stepic/Sources/Modules/CourseList/Provider/CourseListTypes.swift
+++ b/Stepic/Sources/Modules/CourseList/Provider/CourseListTypes.swift
@@ -55,9 +55,9 @@ final class CourseListServicesFactory {
 
     init(
         type: CourseListType,
-        coursesAPI: CoursesAPI,
-        userCoursesAPI: UserCoursesAPI,
-        searchResultsAPI: SearchResultsAPI
+        coursesAPI: CoursesAPI = CoursesAPI(),
+        userCoursesAPI: UserCoursesAPI = UserCoursesAPI(),
+        searchResultsAPI: SearchResultsAPI = SearchResultsAPI()
     ) {
         self.type = type
         self.coursesAPI = coursesAPI
diff --git a/Stepic/Sources/Modules/CourseList/Views/CourseListView.swift b/Stepic/Sources/Modules/CourseList/Views/CourseListView.swift
index 09c11d372c..98a21d7fcc 100644
--- a/Stepic/Sources/Modules/CourseList/Views/CourseListView.swift
+++ b/Stepic/Sources/Modules/CourseList/Views/CourseListView.swift
@@ -122,11 +122,10 @@ class CourseListView: UIView {
         }
 
         if columnWidth < minimumColumnWidth {
-            columnsCount -= 1
+            columnsCount = max(1, columnsCount - 1)
             columnWidth = calculateColumnWidth(columnsCount: columnsCount)
         }
 
-        columnsCount = max(1, columnsCount)
         columnWidth = max(minimumColumnWidth, columnWidth)
 
         return (columnsCount, columnWidth)
diff --git a/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetStatsView.swift b/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetStatsView.swift
index 1b2f9e185b..a83d6c4f8a 100644
--- a/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetStatsView.swift
+++ b/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetStatsView.swift
@@ -8,6 +8,8 @@ extension CourseWidgetStatsView {
 
         let learnersViewImageViewSize = CGSize(width: 8, height: 10)
         let ratingViewImageViewSize = CGSize(width: 8, height: 12)
+        let certificatesViewImageViewSize = CGSize(width: 12, height: 12)
+        let archiveViewImageViewSize = CGSize(width: 14, height: 13)
         let progressViewImageViewSize = CGSize(width: 12, height: 12)
 
         let imagesRenderingSize = CGSize(width: 30, height: 30)
@@ -25,17 +27,31 @@ final class CourseWidgetStatsView: UIView {
 
     var learnersLabelText: String? {
         didSet {
+            self.learnersView.isHidden = self.learnersLabelText?.isEmpty ?? true
             self.learnersView.text = self.learnersLabelText
         }
     }
 
+    var certificatesLabelText: String? {
+        didSet {
+            self.certificatesView.isHidden = self.certificatesLabelText?.isEmpty ?? true
+            self.certificatesView.text = self.certificatesLabelText
+        }
+    }
+
     var ratingLabelText: String? {
         didSet {
-            self.ratingView.isHidden = self.ratingLabelText == nil
+            self.ratingView.isHidden = self.ratingLabelText?.isEmpty ?? true
             self.ratingView.text = self.ratingLabelText
         }
     }
 
+    var isArchived: Bool = false {
+        didSet {
+            self.archiveView.isHidden = !self.isArchived
+        }
+    }
+
     var progress: CourseWidgetProgressViewModel? {
         didSet {
             guard let progress = self.progress else {
@@ -57,6 +73,27 @@ final class CourseWidgetStatsView: UIView {
         return view
     }()
 
+    private lazy var certificatesView: CourseWidgetStatsItemView = {
+        var appearance = CourseWidgetStatsItemView.Appearance()
+        appearance.imageViewSize = self.appearance.certificatesViewImageViewSize
+        appearance.imageTintColor = self.appearance.itemImageTintColor
+        appearance.textColor = self.appearance.itemTextColor
+        let view = CourseWidgetStatsItemView(appearance: appearance)
+        view.image = UIImage(named: "course-widget-certificate")?.withRenderingMode(.alwaysTemplate)
+        return view
+    }()
+
+    private lazy var archiveView: CourseWidgetStatsItemView = {
+        var appearance = CourseWidgetStatsItemView.Appearance()
+        appearance.imageViewSize = self.appearance.archiveViewImageViewSize
+        appearance.imageTintColor = self.appearance.itemImageTintColor
+        appearance.textColor = self.appearance.itemTextColor
+        let view = CourseWidgetStatsItemView(appearance: appearance)
+        view.image = UIImage(named: "course-widget-archive")?.withRenderingMode(.alwaysTemplate)
+        view.text = NSLocalizedString("CourseWidgetArchived", comment: "")
+        return view
+    }()
+
     private lazy var ratingView: CourseWidgetStatsItemView = {
         var appearance = CourseWidgetStatsItemView.Appearance()
         appearance.imageViewSize = self.appearance.ratingViewImageViewSize
@@ -116,6 +153,7 @@ final class CourseWidgetStatsView: UIView {
 
 extension CourseWidgetStatsView: ProgrammaticallyInitializableViewProtocol {
     func setupView() {
+        self.archiveView.isHidden = true
         self.ratingView.isHidden = false
         self.progressView.isHidden = false
     }
@@ -125,6 +163,8 @@ extension CourseWidgetStatsView: ProgrammaticallyInitializableViewProtocol {
 
         self.stackView.addArrangedSubview(self.learnersView)
         self.stackView.addArrangedSubview(self.ratingView)
+        self.stackView.addArrangedSubview(self.certificatesView)
+        self.stackView.addArrangedSubview(self.archiveView)
         self.stackView.addArrangedSubview(self.progressView)
     }
 
diff --git a/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetView.swift b/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetView.swift
index 57113c2e9b..dd1a7b4060 100644
--- a/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetView.swift
+++ b/Stepic/Sources/Modules/CourseList/Views/Widget/CourseWidgetView.swift
@@ -6,7 +6,11 @@ extension CourseWidgetView {
         let coverViewInsets = LayoutInsets(top: 16, left: 16)
         let coverViewWidthHeight: CGFloat = 80.0
 
-        let titleLabelInsets = LayoutInsets(left: 8, right: 16)
+        let titleLabelInsets = LayoutInsets(left: 8, right: 8)
+
+        let badgeImageViewInsets = LayoutInsets(right: 16)
+        let badgeImageViewTintColor = UIColor.stepikAccent
+        let badgeImageViewSize = CGSize(width: 18, height: 18)
 
         let statsViewHeight: CGFloat = 17
         let statsViewInsets = LayoutInsets(top: 8)
@@ -28,6 +32,14 @@ final class CourseWidgetView: UIView {
     private lazy var titleLabel = CourseWidgetLabel(
         appearance: self.colorMode.courseWidgetTitleLabelAppearance
     )
+
+    private lazy var badgeImageView: UIImageView = {
+        let imageView = UIImageView()
+        imageView.contentMode = .scaleAspectFit
+        imageView.tintColor = self.appearance.badgeImageViewTintColor
+        return imageView
+    }()
+
     private lazy var statsView = CourseWidgetStatsView(
         appearance: self.colorMode.courseWidgetStatsViewAppearance
     )
@@ -50,6 +62,8 @@ final class CourseWidgetView: UIView {
         return button
     }()
 
+    private var badgeImageViewWidthConstraint: Constraint?
+
     var onContinueLearningButtonClick: (() -> Void)?
 
     init(
@@ -80,9 +94,20 @@ final class CourseWidgetView: UIView {
         self.separatorView.isHidden = !viewModel.isEnrolled
         self.continueLearningButton.isHidden = !viewModel.isEnrolled
 
-        self.statsView.learnersLabelText = viewModel.learnersLabelText
-        self.statsView.ratingLabelText = viewModel.ratingLabelText
-        self.statsView.progress = viewModel.progress
+        self.statsView.learnersLabelText = viewModel.isEnrolled ? nil : viewModel.learnersLabelText
+        self.statsView.certificatesLabelText = viewModel.isEnrolled ? nil : viewModel.certificateLabelText
+        self.statsView.ratingLabelText = viewModel.isEnrolled ? nil : viewModel.ratingLabelText
+
+        let isArchived = viewModel.userCourse?.isArchived ?? false
+        self.statsView.isArchived = isArchived
+        self.statsView.progress = isArchived ? nil : viewModel.progress
+
+        let isFavorite = viewModel.userCourse?.isFavorite ?? false
+        self.badgeImageView.image = isFavorite
+            ? UIImage(named: "course-widget-favorite")?.withRenderingMode(.alwaysTemplate)
+            : nil
+        self.badgeImageViewWidthConstraint?.update(offset: isFavorite ? self.appearance.badgeImageViewSize.width : 0)
+        self.badgeImageView.isHidden = !isFavorite
     }
 
     func updateProgress(viewModel: CourseWidgetProgressViewModel) {
@@ -101,6 +126,7 @@ extension CourseWidgetView: ProgrammaticallyInitializableViewProtocol {
     func addSubviews() {
         self.addSubview(self.coverView)
         self.addSubview(self.titleLabel)
+        self.addSubview(self.badgeImageView)
         self.addSubview(self.statsView)
         self.addSubview(self.summaryLabel)
         self.addSubview(self.continueLearningButton)
@@ -129,10 +155,23 @@ extension CourseWidgetView: ProgrammaticallyInitializableViewProtocol {
                 .equalTo(self.coverView.snp.trailing)
                 .offset(self.appearance.titleLabelInsets.left)
             make.trailing
-                .equalToSuperview()
+                .equalTo(self.badgeImageView.snp.leading)
                 .offset(-self.appearance.titleLabelInsets.right)
         }
 
+        self.badgeImageView.translatesAutoresizingMaskIntoConstraints = false
+        self.badgeImageView.snp.makeConstraints { make in
+            make.top
+                .equalTo(self.coverView.snp.top)
+            make.trailing
+                .equalToSuperview()
+                .offset(-self.appearance.badgeImageViewInsets.right)
+            self.badgeImageViewWidthConstraint = make.width
+                .equalTo(self.appearance.badgeImageViewSize.width)
+                .constraint
+            make.height.equalTo(self.appearance.badgeImageViewSize.height)
+        }
+
         self.statsView.translatesAutoresizingMaskIntoConstraints = false
         self.statsView.snp.makeConstraints { make in
             make.top
diff --git a/Stepic/Sources/Modules/Settings/SettingsAssembly.swift b/Stepic/Sources/Modules/Settings/SettingsAssembly.swift
index 836bd0f1ba..ce5d539d37 100644
--- a/Stepic/Sources/Modules/Settings/SettingsAssembly.swift
+++ b/Stepic/Sources/Modules/Settings/SettingsAssembly.swift
@@ -22,18 +22,7 @@ final class SettingsAssembly: Assembly {
             stepFontSizeStorageManager: StepFontSizeStorageManager(),
             autoplayStorageManager: AutoplayStorageManager(),
             adaptiveStorageManager: AdaptiveStorageManager.shared,
-            applicationThemeService: ApplicationThemeService(),
-            downloadsProvider: DownloadsProvider(
-                coursesPersistenceService: CoursesPersistenceService(),
-                adaptiveStorageManager: AdaptiveStorageManager.shared,
-                videoFileManager: VideoStoredFileManager(fileManager: .default),
-                imageFileManager: ImageStoredFileManager(fileManager: .default),
-                storageUsageService: StorageUsageService(
-                    videoFileManager: VideoStoredFileManager(fileManager: .default),
-                    imageFileManager: ImageStoredFileManager(fileManager: .default)
-                )
-            ),
-            arQuickLookStoredFileManager: ARQuickLookStoredFileManager(fileManager: .default)
+            applicationThemeService: ApplicationThemeService()
         )
         let presenter = SettingsPresenter()
         let interactor = SettingsInteractor(
@@ -41,7 +30,8 @@ final class SettingsAssembly: Assembly {
             provider: provider,
             analytics: StepikAnalytics.shared,
             userAccountService: UserAccountService(),
-            remoteConfig: .shared
+            remoteConfig: .shared,
+            downloadsDeletionService: DownloadsDeletionService()
         )
         let viewController = SettingsViewController(
             interactor: interactor,
diff --git a/Stepic/Sources/Modules/Settings/SettingsInteractor.swift b/Stepic/Sources/Modules/Settings/SettingsInteractor.swift
index 417c112111..3abd8c4c29 100644
--- a/Stepic/Sources/Modules/Settings/SettingsInteractor.swift
+++ b/Stepic/Sources/Modules/Settings/SettingsInteractor.swift
@@ -36,6 +36,8 @@ final class SettingsInteractor: SettingsInteractorProtocol {
     private let userAccountService: UserAccountServiceProtocol
     private let remoteConfig: RemoteConfig
 
+    private let downloadsDeletionService: DownloadsDeletionServiceProtocol
+
     private var settingsData: Settings.SettingsData {
         .init(
             downloadVideoQuality: self.provider.globalDownloadVideoQuality,
@@ -55,13 +57,15 @@ final class SettingsInteractor: SettingsInteractorProtocol {
         provider: SettingsProviderProtocol,
         analytics: Analytics,
         userAccountService: UserAccountServiceProtocol,
-        remoteConfig: RemoteConfig
+        remoteConfig: RemoteConfig,
+        downloadsDeletionService: DownloadsDeletionServiceProtocol
     ) {
         self.presenter = presenter
         self.provider = provider
         self.analytics = analytics
         self.userAccountService = userAccountService
         self.remoteConfig = remoteConfig
+        self.downloadsDeletionService = downloadsDeletionService
     }
 
     func doSettingsLoad(request: Settings.SettingsLoad.Request) {
@@ -163,7 +167,7 @@ final class SettingsInteractor: SettingsInteractorProtocol {
             // For better waiting animation.
             after(.seconds(1))
         }.then {
-            self.provider.deleteAllDownloadedContent()
+            self.downloadsDeletionService.deleteAllDownloads()
         }.done {
             self.presenter.presentDeleteAllContentResult(response: .init(isSuccessful: true))
         }.catch { _ in
diff --git a/Stepic/Sources/Modules/Settings/SettingsProvider.swift b/Stepic/Sources/Modules/Settings/SettingsProvider.swift
index 2dbe8065fc..56b697b5ea 100644
--- a/Stepic/Sources/Modules/Settings/SettingsProvider.swift
+++ b/Stepic/Sources/Modules/Settings/SettingsProvider.swift
@@ -22,8 +22,6 @@ protocol SettingsProviderProtocol: AnyObject {
 
     var isAutoplayEnabled: Bool { get set }
     var isAdaptiveModeEnabled: Bool { get set }
-
-    func deleteAllDownloadedContent() -> Promise<Void>
 }
 
 final class SettingsProvider: SettingsProviderProtocol {
@@ -36,9 +34,6 @@ final class SettingsProvider: SettingsProviderProtocol {
     private let adaptiveStorageManager: AdaptiveStorageManagerProtocol
     private let applicationThemeService: ApplicationThemeServiceProtocol
 
-    private let downloadsProvider: DownloadsProviderProtocol
-    private let arQuickLookStoredFileManager: ARQuickLookStoredFileManagerProtocol
-
     var globalDownloadVideoQuality: DownloadVideoQuality {
         get {
             self.downloadVideoQualityStorageManager.globalDownloadVideoQuality
@@ -129,9 +124,7 @@ final class SettingsProvider: SettingsProviderProtocol {
         stepFontSizeStorageManager: StepFontSizeStorageManagerProtocol,
         autoplayStorageManager: AutoplayStorageManagerProtocol,
         adaptiveStorageManager: AdaptiveStorageManagerProtocol,
-        applicationThemeService: ApplicationThemeServiceProtocol,
-        downloadsProvider: DownloadsProviderProtocol,
-        arQuickLookStoredFileManager: ARQuickLookStoredFileManagerProtocol
+        applicationThemeService: ApplicationThemeServiceProtocol
     ) {
         self.downloadVideoQualityStorageManager = downloadVideoQualityStorageManager
         self.streamVideoQualityStorageManager = streamVideoQualityStorageManager
@@ -141,18 +134,5 @@ final class SettingsProvider: SettingsProviderProtocol {
         self.autoplayStorageManager = autoplayStorageManager
         self.adaptiveStorageManager = adaptiveStorageManager
         self.applicationThemeService = applicationThemeService
-        self.downloadsProvider = downloadsProvider
-        self.arQuickLookStoredFileManager = arQuickLookStoredFileManager
-    }
-
-    func deleteAllDownloadedContent() -> Promise<Void> {
-        firstly {
-            self.downloadsProvider.fetchCachedCourses()
-        }.then { cachedCourses in
-            self.downloadsProvider.deleteCachedCourses(cachedCourses)
-        }.then { _ -> Promise<Void> in
-            try? self.arQuickLookStoredFileManager.removeAllARQuickLookStoredFiles()
-            return Promise.value(())
-        }
     }
 }
diff --git a/Stepic/Sources/Services/AppData/DownloadsDeletionService.swift b/Stepic/Sources/Services/AppData/DownloadsDeletionService.swift
new file mode 100644
index 0000000000..c01b8c078b
--- /dev/null
+++ b/Stepic/Sources/Services/AppData/DownloadsDeletionService.swift
@@ -0,0 +1,47 @@
+import Foundation
+import PromiseKit
+
+protocol DownloadsDeletionServiceProtocol: AnyObject {
+    /// Deletes all stored video, image and AR Quick Look files.
+    func deleteAllDownloads() -> Guarantee<Void>
+}
+
+final class DownloadsDeletionService: DownloadsDeletionServiceProtocol {
+    private let downloadsProvider: DownloadsProviderProtocol
+    private let arQuickLookStoredFileManager: ARQuickLookStoredFileManagerProtocol
+
+    init(
+        downloadsProvider: DownloadsProviderProtocol,
+        arQuickLookStoredFileManager: ARQuickLookStoredFileManagerProtocol
+    ) {
+        self.downloadsProvider = downloadsProvider
+        self.arQuickLookStoredFileManager = arQuickLookStoredFileManager
+    }
+
+    convenience init() {
+        self.init(
+            downloadsProvider: DownloadsProvider(
+                coursesPersistenceService: CoursesPersistenceService(),
+                adaptiveStorageManager: AdaptiveStorageManager.shared,
+                videoFileManager: VideoStoredFileManager(fileManager: .default),
+                imageFileManager: ImageStoredFileManager(fileManager: .default),
+                storageUsageService: StorageUsageService(
+                    videoFileManager: VideoStoredFileManager(fileManager: .default),
+                    imageFileManager: ImageStoredFileManager(fileManager: .default)
+                )
+            ),
+            arQuickLookStoredFileManager: ARQuickLookStoredFileManager(fileManager: .default)
+        )
+    }
+
+    func deleteAllDownloads() -> Guarantee<Void> {
+        firstly {
+            self.downloadsProvider.fetchCachedCourses()
+        }.then { cachedCourses in
+            self.downloadsProvider.deleteCachedCourses(cachedCourses)
+        }.then { _ -> Guarantee<Void> in
+            try? self.arQuickLookStoredFileManager.removeAllARQuickLookStoredFiles()
+            return Guarantee.value(())
+        }
+    }
+}
diff --git a/Stepic/Sources/Services/AppData/LogoutDataClearService.swift b/Stepic/Sources/Services/AppData/LogoutDataClearService.swift
new file mode 100644
index 0000000000..415771e2c7
--- /dev/null
+++ b/Stepic/Sources/Services/AppData/LogoutDataClearService.swift
@@ -0,0 +1,222 @@
+import Foundation
+import PromiseKit
+
+protocol LogoutDataClearServiceProtocol: AnyObject {
+    func clearCurrentUserData() -> Guarantee<Void>
+}
+
+final class LogoutDataClearService: LogoutDataClearServiceProtocol {
+    private let downloadsDeletionService: DownloadsDeletionServiceProtocol
+    // Persistence
+    private let assignmentsPersistenceService: AssignmentsPersistenceServiceProtocol
+    private let attemptsPersistenceService: AttemptsPersistenceServiceProtocol
+    private let blocksPersistenceService: BlocksPersistenceServiceProtocol
+    private let certificatesPersistenceService: CertificatesPersistenceServiceProtocol
+    private let codeLimitsPersistenceService: CodeLimitsPersistenceServiceProtocol
+    private let codeSamplesPersistenceService: CodeSamplesPersistenceServiceProtocol
+    private let codeTemplatePersistenceService: CodeTemplatesPersistenceServiceProtocol
+    private let coursesPersistenceService: CoursesPersistenceServiceProtocol
+    private let courseReviewsPersistenceService: CourseReviewsPersistenceServiceProtocol
+    private let discussionThreadsPersistenceService: DiscussionThreadsPersistenceServiceProtocol
+    private let emailAddressesPersistenceService: EmailAddressesPersistenceServiceProtocol
+    private let lastCodeLanguagePersistenceService: LastCodeLanguagePersistenceServiceProtocol
+    private let lastStepPersistenceService: LastStepPersistenceServiceProtocol
+    private let lessonsPersistenceService: LessonsPersistenceServiceProtocol
+    private let notificationsPersistenceService: NotificationsPersistenceServiceProtocol
+    private let profilesPersistenceService: ProfilesPersistenceServiceProtocol
+    private let progressesPersistenceService: ProgressesPersistenceServiceProtocol
+    private let sectionsPersistenceService: SectionsPersistenceServiceProtocol
+    private let stepOptionsPersistenceService: StepOptionsPersistenceServiceProtocol
+    private let stepsPersistenceService: StepsPersistenceServiceProtocol
+    private let submissionsPersistenceService: SubmissionsPersistenceServiceProtocol
+    private let unitsPersistenceService: UnitsPersistenceServiceProtocol
+    private let userActivitiesPersistenceService: UserActivitiesPersistenceServiceProtocol
+    private let userCoursesPersistenceService: UserCoursesPersistenceServiceProtocol
+    private let videosPersistenceService: VideosPersistenceServiceProtocol
+    private let videoURLsPersistenceService: VideoURLsPersistenceServiceProtocol
+    // Notifications
+    private let notificationsRegistrationService: NotificationsRegistrationServiceProtocol
+    private let notificationsService: NotificationsService
+    private let notificationsBadgesManager: NotificationsBadgesManager
+
+    private let spotlightIndexingService: SpotlightIndexingServiceProtocol
+    private let analyticsUserProperties: AnalyticsUserProperties
+    private let deviceDefaults: DeviceDefaults
+
+    private let synchronizationQueue = DispatchQueue(
+        label: "com.AlexKarpov.Stepic.LogoutDataClearQueue",
+        qos: .userInitiated
+    )
+    private let semaphore = DispatchSemaphore(value: 1)
+
+    // swiftlint:disable line_length
+    init(
+        downloadsDeletionService: DownloadsDeletionServiceProtocol = DownloadsDeletionService(),
+        assignmentsPersistenceService: AssignmentsPersistenceServiceProtocol = AssignmentsPersistenceService(),
+        attemptsPersistenceService: AttemptsPersistenceServiceProtocol = AttemptsPersistenceService(),
+        blocksPersistenceService: BlocksPersistenceServiceProtocol = BlocksPersistenceService(),
+        certificatesPersistenceService: CertificatesPersistenceServiceProtocol = CertificatesPersistenceService(),
+        codeLimitsPersistenceService: CodeLimitsPersistenceServiceProtocol = CodeLimitsPersistenceService(),
+        codeSamplesPersistenceService: CodeSamplesPersistenceServiceProtocol = CodeSamplesPersistenceService(),
+        codeTemplatePersistenceService: CodeTemplatesPersistenceServiceProtocol = CodeTemplatesPersistenceService(),
+        coursesPersistenceService: CoursesPersistenceServiceProtocol = CoursesPersistenceService(),
+        courseReviewsPersistenceService: CourseReviewsPersistenceServiceProtocol = CourseReviewsPersistenceService(),
+        discussionThreadsPersistenceService: DiscussionThreadsPersistenceServiceProtocol = DiscussionThreadsPersistenceService(),
+        emailAddressesPersistenceService: EmailAddressesPersistenceServiceProtocol = EmailAddressesPersistenceService(),
+        lastCodeLanguagePersistenceService: LastCodeLanguagePersistenceServiceProtocol = LastCodeLanguagePersistenceService(),
+        lastStepPersistenceService: LastStepPersistenceServiceProtocol = LastStepPersistenceService(),
+        lessonsPersistenceService: LessonsPersistenceServiceProtocol = LessonsPersistenceService(),
+        notificationsPersistenceService: NotificationsPersistenceServiceProtocol = NotificationsPersistenceService(),
+        profilesPersistenceService: ProfilesPersistenceServiceProtocol = ProfilesPersistenceService(),
+        progressesPersistenceService: ProgressesPersistenceServiceProtocol = ProgressesPersistenceService(),
+        sectionsPersistenceService: SectionsPersistenceServiceProtocol = SectionsPersistenceService(),
+        stepsPersistenceService: StepsPersistenceServiceProtocol = StepsPersistenceService(),
+        stepOptionsPersistenceService: StepOptionsPersistenceServiceProtocol = StepOptionsPersistenceService(),
+        submissionsPersistenceService: SubmissionsPersistenceServiceProtocol = SubmissionsPersistenceService(),
+        unitsPersistenceService: UnitsPersistenceServiceProtocol = UnitsPersistenceService(),
+        userActivitiesPersistenceService: UserActivitiesPersistenceServiceProtocol = UserActivitiesPersistenceService(),
+        userCoursesPersistenceService: UserCoursesPersistenceServiceProtocol = UserCoursesPersistenceService(),
+        videosPersistenceService: VideosPersistenceServiceProtocol = VideosPersistenceService(),
+        videoURLsPersistenceService: VideoURLsPersistenceServiceProtocol = VideoURLsPersistenceService(),
+        notificationsRegistrationService: NotificationsRegistrationServiceProtocol = NotificationsRegistrationService(),
+        notificationsService: NotificationsService = NotificationsService(),
+        spotlightIndexingService: SpotlightIndexingServiceProtocol = SpotlightIndexingService.shared,
+        analyticsUserProperties: AnalyticsUserProperties = .shared,
+        notificationsBadgesManager: NotificationsBadgesManager = .shared,
+        deviceDefaults: DeviceDefaults = .sharedDefaults
+    ) {
+        self.downloadsDeletionService = downloadsDeletionService
+        self.assignmentsPersistenceService = assignmentsPersistenceService
+        self.attemptsPersistenceService = attemptsPersistenceService
+        self.blocksPersistenceService = blocksPersistenceService
+        self.certificatesPersistenceService = certificatesPersistenceService
+        self.codeLimitsPersistenceService = codeLimitsPersistenceService
+        self.codeSamplesPersistenceService = codeSamplesPersistenceService
+        self.codeTemplatePersistenceService = codeTemplatePersistenceService
+        self.coursesPersistenceService = coursesPersistenceService
+        self.courseReviewsPersistenceService = courseReviewsPersistenceService
+        self.discussionThreadsPersistenceService = discussionThreadsPersistenceService
+        self.emailAddressesPersistenceService = emailAddressesPersistenceService
+        self.lastCodeLanguagePersistenceService = lastCodeLanguagePersistenceService
+        self.lastStepPersistenceService = lastStepPersistenceService
+        self.lessonsPersistenceService = lessonsPersistenceService
+        self.notificationsPersistenceService = notificationsPersistenceService
+        self.profilesPersistenceService = profilesPersistenceService
+        self.progressesPersistenceService = progressesPersistenceService
+        self.sectionsPersistenceService = sectionsPersistenceService
+        self.stepsPersistenceService = stepsPersistenceService
+        self.stepOptionsPersistenceService = stepOptionsPersistenceService
+        self.submissionsPersistenceService = submissionsPersistenceService
+        self.unitsPersistenceService = unitsPersistenceService
+        self.userActivitiesPersistenceService = userActivitiesPersistenceService
+        self.userCoursesPersistenceService = userCoursesPersistenceService
+        self.videosPersistenceService = videosPersistenceService
+        self.videoURLsPersistenceService = videoURLsPersistenceService
+        self.notificationsRegistrationService = notificationsRegistrationService
+        self.notificationsService = notificationsService
+        self.spotlightIndexingService = spotlightIndexingService
+        self.analyticsUserProperties = analyticsUserProperties
+        self.notificationsBadgesManager = notificationsBadgesManager
+        self.deviceDefaults = deviceDefaults
+    }
+
+    func clearCurrentUserData() -> Guarantee<Void> {
+        Guarantee { seal in
+            self.synchronizationQueue.async { [weak self] in
+                guard let strongSelf = self else {
+                    return seal(())
+                }
+
+                strongSelf.semaphore.wait()
+                DispatchQueue.main.async {
+                    strongSelf.clearData().done {
+                        seal(())
+                        strongSelf.semaphore.signal()
+                    }
+                }
+            }
+        }
+    }
+
+    private func clearData() -> Guarantee<Void> {
+        firstly { () -> Guarantee<Void> in
+            self.notificationsRegistrationService.unregisterForRemoteNotifications()
+        }.then { () -> Guarantee<Void> in
+            self.downloadsDeletionService.deleteAllDownloads()
+        }.then { () -> Guarantee<Void> in
+            self.clearDatabase()
+        }.then { () -> Guarantee<Void> in
+            self.clearCourseListPersistenceStorages()
+        }.done {
+            self.analyticsUserProperties.clearUserDependentProperties()
+            self.notificationsBadgesManager.set(number: 0)
+
+            self.deviceDefaults.deviceId = nil
+
+            self.notificationsService.removeAllLocalNotifications()
+            self.spotlightIndexingService.deleteAllSearchableItems()
+        }
+    }
+
+    private func clearDatabase() -> Guarantee<Void> {
+        Guarantee { seal in
+            firstly { () -> Guarantee<[Course]> in
+                self.coursesPersistenceService.fetchEnrolled()
+            }.then { (enrolledCourses: [Course]) -> Guarantee<[Result<Void>]> in
+                for course in enrolledCourses {
+                    course.enrolled = false
+                }
+
+                return when(
+                    resolved: [
+                        self.assignmentsPersistenceService.deleteAll(),
+                        self.attemptsPersistenceService.deleteAll(),
+                        self.blocksPersistenceService.deleteAll(),
+                        self.certificatesPersistenceService.deleteAll(),
+                        self.codeLimitsPersistenceService.deleteAll(),
+                        self.codeSamplesPersistenceService.deleteAll(),
+                        self.codeTemplatePersistenceService.deleteAll(),
+                        self.courseReviewsPersistenceService.deleteAll(),
+                        self.discussionThreadsPersistenceService.deleteAll(),
+                        self.emailAddressesPersistenceService.deleteAll(),
+                        self.lastCodeLanguagePersistenceService.deleteAll(),
+                        self.lastStepPersistenceService.deleteAll(),
+                        self.lessonsPersistenceService.deleteAll(),
+                        self.notificationsPersistenceService.deleteAll(),
+                        self.profilesPersistenceService.deleteAll(),
+                        self.progressesPersistenceService.deleteAll(),
+                        self.sectionsPersistenceService.deleteAll(),
+                        self.stepsPersistenceService.deleteAll(),
+                        self.stepOptionsPersistenceService.deleteAll(),
+                        self.submissionsPersistenceService.deleteAll(),
+                        self.unitsPersistenceService.deleteAll(),
+                        self.userActivitiesPersistenceService.deleteAll(),
+                        self.userCoursesPersistenceService.deleteAll(),
+                        self.videosPersistenceService.deleteAll(),
+                        self.videoURLsPersistenceService.deleteAll()
+                    ]
+                )
+            }.done { _ in
+                CoreDataHelper.shared.save()
+                seal(())
+            }
+        }
+    }
+
+    private func clearCourseListPersistenceStorages() -> Guarantee<Void> {
+        Guarantee { seal in
+            let courseListTypes: [CourseListType] = [
+                EnrolledCourseListType(),
+                FavoriteCourseListType(),
+                ArchivedCourseListType()
+            ]
+
+            for courseListType in courseListTypes {
+                let persistenceService = CourseListServicesFactory(type: courseListType).makePersistenceService()
+                persistenceService?.update(newCachedList: [])
+            }
+
+            seal(())
+        }
+    }
+}
diff --git a/Stepic/Sources/Services/StorageUsageService.swift b/Stepic/Sources/Services/AppData/StorageUsageService.swift
similarity index 100%
rename from Stepic/Sources/Services/StorageUsageService.swift
rename to Stepic/Sources/Services/AppData/StorageUsageService.swift
diff --git a/Stepic/Sources/Services/CodeEditorThemeService.swift b/Stepic/Sources/Services/CodeEditor/CodeEditorThemeService.swift
similarity index 100%
rename from Stepic/Sources/Services/CodeEditorThemeService.swift
rename to Stepic/Sources/Services/CodeEditor/CodeEditorThemeService.swift
diff --git a/Stepic/Sources/Services/CodeLanguageSuggestionsService.swift b/Stepic/Sources/Services/CodeEditor/CodeLanguageSuggestionsService.swift
similarity index 100%
rename from Stepic/Sources/Services/CodeLanguageSuggestionsService.swift
rename to Stepic/Sources/Services/CodeEditor/CodeLanguageSuggestionsService.swift
diff --git a/Stepic/Sources/Services/ContentLanguageService.swift b/Stepic/Sources/Services/ContentLanguage/ContentLanguageService.swift
similarity index 100%
rename from Stepic/Sources/Services/ContentLanguageService.swift
rename to Stepic/Sources/Services/ContentLanguage/ContentLanguageService.swift
diff --git a/Stepic/Sources/Services/ContentLanguageSwitchAvailabilityService.swift b/Stepic/Sources/Services/ContentLanguage/ContentLanguageSwitchAvailabilityService.swift
similarity index 100%
rename from Stepic/Sources/Services/ContentLanguageSwitchAvailabilityService.swift
rename to Stepic/Sources/Services/ContentLanguage/ContentLanguageSwitchAvailabilityService.swift
diff --git a/Stepic/Sources/Services/DataBackUpdateService.swift b/Stepic/Sources/Services/DataBackUpdateService.swift
index 4d93f274d1..5bb812d135 100644
--- a/Stepic/Sources/Services/DataBackUpdateService.swift
+++ b/Stepic/Sources/Services/DataBackUpdateService.swift
@@ -3,11 +3,12 @@ import PromiseKit
 
 /// Which object was updated
 enum DataBackUpdateTarget {
-    case course(_: Course)
-    case section(_: Section)
-    case unit(_: Unit)
-    case progress(_: Progress)
-    case profile(_: Profile)
+    case course(Course)
+    case section(Section)
+    case unit(Unit)
+    case progress(Progress)
+    case profile(Profile)
+    case userCourse(UserCourse)
 }
 
 /// Affected fields in updated object
@@ -56,6 +57,8 @@ protocol DataBackUpdateServiceProtocol: AnyObject {
     func triggerCourseIsFavoriteUpdate(retrievedCourse: Course)
     /// Report about `isArchived` state update with already retrieved course
     func triggerCourseIsArchivedUpdate(retrievedCourse: Course)
+    /// Report about user course update
+    func triggerUserCourseUpdate(updatedUserCourse: UserCourse)
 }
 
 final class DataBackUpdateService: DataBackUpdateServiceProtocol {
@@ -195,6 +198,10 @@ final class DataBackUpdateService: DataBackUpdateServiceProtocol {
         self.postNotification(target: .course(retrievedCourse))
     }
 
+    func triggerUserCourseUpdate(updatedUserCourse: UserCourse) {
+        self.postNotification(target: .userCourse(updatedUserCourse))
+    }
+
     // MARK: Private methods
 
     private func postNotification(description: DataBackUpdateDescription? = nil, target: DataBackUpdateTarget) {
diff --git a/Stepic/Sources/Services/Models/Persistence/AssignmentsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/AssignmentsPersistenceService.swift
index 9685cbf993..d9a9b96885 100644
--- a/Stepic/Sources/Services/Models/Persistence/AssignmentsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/AssignmentsPersistenceService.swift
@@ -1,11 +1,20 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol AssignmentsPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [Assignment.IdType]) -> Promise<[Assignment]>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class AssignmentsPersistenceService: AssignmentsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [Assignment.IdType]) -> Promise<[Assignment]> {
         Promise { seal in
             Assignment.fetchAsync(ids: ids).done { assignments in
@@ -17,7 +26,29 @@ final class AssignmentsPersistenceService: AssignmentsPersistenceServiceProtocol
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Assignment> = Assignment.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let assignments = try self.managedObjectContext.fetch(request)
+                    for assignment in assignments {
+                        self.managedObjectContext.delete(assignment)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("AssignmentsPersistenceService :: failed delete all assignments with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/AttemptsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/AttemptsPersistenceService.swift
index e8d5edc383..ccc8a7e1c4 100644
--- a/Stepic/Sources/Services/Models/Persistence/AttemptsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/AttemptsPersistenceService.swift
@@ -5,7 +5,10 @@ import PromiseKit
 protocol AttemptsPersistenceServiceProtocol: AnyObject {
     func fetchStepAttempts(stepID: Step.IdType) -> Guarantee<[AttemptEntity]>
     func fetch(ids: [Attempt.IdType]) -> Guarantee<[AttemptEntity]>
+
     func save(attempts: [Attempt]) -> Guarantee<Void>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class AttemptsPersistenceService: AttemptsPersistenceServiceProtocol {
@@ -13,8 +16,8 @@ final class AttemptsPersistenceService: AttemptsPersistenceServiceProtocol {
     private let stepsPersistenceService: StepsPersistenceServiceProtocol
 
     init(
-        managedObjectContext: NSManagedObjectContext,
-        stepsPersistenceService: StepsPersistenceServiceProtocol
+        managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context,
+        stepsPersistenceService: StepsPersistenceServiceProtocol = StepsPersistenceService()
     ) {
         self.managedObjectContext = managedObjectContext
         self.stepsPersistenceService = stepsPersistenceService
@@ -101,6 +104,27 @@ final class AttemptsPersistenceService: AttemptsPersistenceServiceProtocol {
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<AttemptEntity> = AttemptEntity.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let attempts = try self.managedObjectContext.fetch(request)
+                    for attempt in attempts {
+                        self.managedObjectContext.delete(attempt)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("AttemptsPersistenceService :: failed delete all attempts with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     // MARK: Private API
 
     private func fetchStep(id: Step.IdType) -> Guarantee<Step?> {
@@ -148,4 +172,8 @@ final class AttemptsPersistenceService: AttemptsPersistenceServiceProtocol {
             }
         }
     }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/BlocksPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/BlocksPersistenceService.swift
new file mode 100644
index 0000000000..223c3315fd
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/BlocksPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol BlocksPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class BlocksPersistenceService: BlocksPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Block> = Block.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let blocks = try self.managedObjectContext.fetch(request)
+                    for block in blocks {
+                        self.managedObjectContext.delete(block)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("BlocksPersistenceService :: failed delete all blocks with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/CertificatesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/CertificatesPersistenceService.swift
new file mode 100644
index 0000000000..76b8abae8c
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/CertificatesPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol CertificatesPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class CertificatesPersistenceService: CertificatesPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Certificate> = Certificate.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let certificates = try self.managedObjectContext.fetch(request)
+                    for certificate in certificates {
+                        self.managedObjectContext.delete(certificate)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("CertificatesPersistenceService :: failed delete all certificates with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/CodeLimitsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/CodeLimitsPersistenceService.swift
new file mode 100644
index 0000000000..b07c4f2053
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/CodeLimitsPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol CodeLimitsPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class CodeLimitsPersistenceService: CodeLimitsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<CodeLimit> = CodeLimit.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let codeLimits = try self.managedObjectContext.fetch(request)
+                    for codeLimit in codeLimits {
+                        self.managedObjectContext.delete(codeLimit)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("CodeLimitsPersistenceService :: failed delete all code limits with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/CodeSamplesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/CodeSamplesPersistenceService.swift
new file mode 100644
index 0000000000..4f0bcc6838
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/CodeSamplesPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol CodeSamplesPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class CodeSamplesPersistenceService: CodeSamplesPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<CodeSample> = CodeSample.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let codeSamples = try self.managedObjectContext.fetch(request)
+                    for codeSample in codeSamples {
+                        self.managedObjectContext.delete(codeSample)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("CodeSamplesPersistenceService :: failed delete all code samples with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/CodeTemplatesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/CodeTemplatesPersistenceService.swift
new file mode 100644
index 0000000000..6187f0e0a4
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/CodeTemplatesPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol CodeTemplatesPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class CodeTemplatesPersistenceService: CodeTemplatesPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<CodeTemplate> = CodeTemplate.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let codeTemplates = try self.managedObjectContext.fetch(request)
+                    for codeTemplate in codeTemplates {
+                        self.managedObjectContext.delete(codeTemplate)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("CodeTemplatePersistenceService :: failed delete all code templates with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/CourseReviewSummariesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/CourseReviewSummariesPersistenceService.swift
index b0999183eb..84dd765c2d 100644
--- a/Stepic/Sources/Services/Models/Persistence/CourseReviewSummariesPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/CourseReviewSummariesPersistenceService.swift
@@ -1,20 +1,23 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol CourseReviewSummariesPersistenceServiceProtocol: AnyObject {
-    func fetch(
-        ids: [CourseReviewSummary.IdType],
-        page: Int
-    ) -> Promise<([CourseReviewSummary], Meta)>
+    func fetch(ids: [CourseReviewSummary.IdType], page: Int) -> Promise<([CourseReviewSummary], Meta)>
     func fetch(id: CourseReviewSummary.IdType) -> Promise<CourseReviewSummary?>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class CourseReviewSummariesPersistenceService: CourseReviewSummariesPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     // swiftlint:disable:next unavailable_function
-    func fetch(
-        ids: [CourseReviewSummary.IdType],
-        page: Int = 1
-    ) -> Promise<([CourseReviewSummary], Meta)> {
+    func fetch(ids: [CourseReviewSummary.IdType], page: Int = 1) -> Promise<([CourseReviewSummary], Meta)> {
         fatalError("Not implemented yet")
     }
 
@@ -28,7 +31,29 @@ final class CourseReviewSummariesPersistenceService: CourseReviewSummariesPersis
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<CourseReviewSummary> = CourseReviewSummary.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let courseReviewSummaries = try self.managedObjectContext.fetch(request)
+                    for courseReviewSummary in courseReviewSummaries {
+                        self.managedObjectContext.delete(courseReviewSummary)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("CourseReviewSummariesPersistenceService :: failed delete all reviews with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/CourseReviewsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/CourseReviewsPersistenceService.swift
index 4b395467f6..78a871d03f 100644
--- a/Stepic/Sources/Services/Models/Persistence/CourseReviewsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/CourseReviewsPersistenceService.swift
@@ -1,3 +1,4 @@
+import CoreData
 import Foundation
 import PromiseKit
 
@@ -5,10 +6,18 @@ protocol CourseReviewsPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [CourseReview.IdType]) -> Guarantee<[CourseReview]>
     func fetch(by courseID: Course.IdType) -> Promise<[CourseReview]>
     func fetch(by courseID: Course.IdType, userID: User.IdType) -> Promise<CourseReview?>
+
     func delete(by courseReviewID: CourseReview.IdType) -> Promise<Void>
+    func deleteAll() -> Promise<Void>
 }
 
 final class CourseReviewsPersistenceService: CourseReviewsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [CourseReview.IdType]) -> Guarantee<[CourseReview]> {
         Guarantee { seal in
             CourseReview.fetchAsync(ids: ids).done { reviews in
@@ -41,4 +50,29 @@ final class CourseReviewsPersistenceService: CourseReviewsPersistenceServiceProt
             }
         }
     }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<CourseReview> = CourseReview.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let courseReviews = try self.managedObjectContext.fetch(request)
+                    for courseReview in courseReviews {
+                        self.managedObjectContext.delete(courseReview)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("CourseReviewsPersistenceService :: failed delete all course reviews with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/CoursesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/CoursesPersistenceService.swift
index 0d5ec03db3..f1b0e65e88 100644
--- a/Stepic/Sources/Services/Models/Persistence/CoursesPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/CoursesPersistenceService.swift
@@ -2,19 +2,14 @@ import Foundation
 import PromiseKit
 
 protocol CoursesPersistenceServiceProtocol: AnyObject {
-    func fetch(
-        ids: [Course.IdType],
-        page: Int
-    ) -> Promise<([Course], Meta)>
+    func fetch(ids: [Course.IdType], page: Int) -> Promise<([Course], Meta)>
     func fetch(id: Course.IdType) -> Promise<Course?>
+    func fetchEnrolled() -> Guarantee<[Course]>
     func fetchAll() -> Guarantee<[Course]>
 }
 
 final class CoursesPersistenceService: CoursesPersistenceServiceProtocol {
-    func fetch(
-        ids: [Course.IdType],
-        page: Int = 1
-    ) -> Promise<([Course], Meta)> {
+    func fetch(ids: [Course.IdType], page: Int = 1) -> Promise<([Course], Meta)> {
         Promise { seal in
             Course.fetchAsync(ids: ids).done { courses in
                 seal.fulfill((courses, Meta.oneAndOnlyPage))
@@ -34,9 +29,17 @@ final class CoursesPersistenceService: CoursesPersistenceServiceProtocol {
         }
     }
 
+    func fetchEnrolled() -> Guarantee<[Course]> {
+        Guarantee { seal in
+            let enrolledCourses = Course.getAllCourses(enrolled: true)
+            seal(enrolledCourses)
+        }
+    }
+
     func fetchAll() -> Guarantee<[Course]> {
         Guarantee { seal in
-            seal(Course.getAllCourses())
+            let allCourses = Course.getAllCourses()
+            seal(allCourses)
         }
     }
 
diff --git a/Stepic/Sources/Services/Models/Persistence/DiscussionThreadsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/DiscussionThreadsPersistenceService.swift
index 7411d108a2..0617cbacf0 100644
--- a/Stepic/Sources/Services/Models/Persistence/DiscussionThreadsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/DiscussionThreadsPersistenceService.swift
@@ -1,11 +1,20 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol DiscussionThreadsPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [DiscussionThread.IdType]) -> Guarantee<[DiscussionThread]>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class DiscussionThreadsPersistenceService: DiscussionThreadsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [DiscussionThread.IdType]) -> Guarantee<[DiscussionThread]> {
         Guarantee { seal in
             DiscussionThread.fetchAsync(ids: ids).done { discussionThreads in
@@ -14,4 +23,29 @@ final class DiscussionThreadsPersistenceService: DiscussionThreadsPersistenceSer
             }
         }
     }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<DiscussionThread> = DiscussionThread.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let discussionThreads = try self.managedObjectContext.fetch(request)
+                    for discussionThread in discussionThreads {
+                        self.managedObjectContext.delete(discussionThread)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("DiscussionThreadsPersistenceService :: failed delete all threads with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/EmailAddressesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/EmailAddressesPersistenceService.swift
index 5edd8bf8f6..fbe148f3fd 100644
--- a/Stepic/Sources/Services/Models/Persistence/EmailAddressesPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/EmailAddressesPersistenceService.swift
@@ -1,11 +1,20 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol EmailAddressesPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [EmailAddress.IdType]) -> Promise<[EmailAddress]>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class EmailAddressesPersistenceService: EmailAddressesPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [EmailAddress.IdType]) -> Promise<[EmailAddress]> {
         Promise { seal in
             EmailAddress.fetchAsync(ids: ids).done { emailAddresses in
@@ -17,7 +26,29 @@ final class EmailAddressesPersistenceService: EmailAddressesPersistenceServicePr
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<EmailAddress> = EmailAddress.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let emailAddresses = try self.managedObjectContext.fetch(request)
+                    for emailAddress in emailAddresses {
+                        self.managedObjectContext.delete(emailAddress)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("EmailAddressesPersistenceService :: failed delete all email adresses with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/LastCodeLanguagePersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/LastCodeLanguagePersistenceService.swift
new file mode 100644
index 0000000000..c35210492a
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/LastCodeLanguagePersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol LastCodeLanguagePersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class LastCodeLanguagePersistenceService: LastCodeLanguagePersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<LastCodeLanguage> = LastCodeLanguage.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let lastCodeLanguages = try self.managedObjectContext.fetch(request)
+                    for lastCodeLanguage in lastCodeLanguages {
+                        self.managedObjectContext.delete(lastCodeLanguage)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("LastCodeLanguagePersistenceService :: failed delete all with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/LastStepPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/LastStepPersistenceService.swift
new file mode 100644
index 0000000000..87c5a88734
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/LastStepPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol LastStepPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class LastStepPersistenceService: LastStepPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<LastStep> = LastStep.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let lastSteps = try self.managedObjectContext.fetch(request)
+                    for lastStep in lastSteps {
+                        self.managedObjectContext.delete(lastStep)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("LastStepPersistenceService :: failed delete all last steps with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/LessonsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/LessonsPersistenceService.swift
index 85769cb3e7..94615a07a0 100644
--- a/Stepic/Sources/Services/Models/Persistence/LessonsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/LessonsPersistenceService.swift
@@ -1,11 +1,19 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol LessonsPersistenceServiceProtocol: AnyObject {
-    func fetch(ids: [Lesson.IdType])-> Promise<[Lesson]>
+    func fetch(ids: [Lesson.IdType]) -> Promise<[Lesson]>
+    func deleteAll() -> Promise<Void>
 }
 
 final class LessonsPersistenceService: LessonsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [Lesson.IdType]) -> Promise<[Lesson]> {
         Promise { seal in
             Lesson.fetchAsync(ids: ids).done { lessons in
@@ -17,7 +25,29 @@ final class LessonsPersistenceService: LessonsPersistenceServiceProtocol {
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Lesson> = Lesson.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let lessons = try self.managedObjectContext.fetch(request)
+                    for lesson in lessons {
+                        self.managedObjectContext.delete(lesson)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("LessonsPersistenceService :: failed delete all lessons with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/NotificationsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/NotificationsPersistenceService.swift
new file mode 100644
index 0000000000..1c770e1918
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/NotificationsPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol NotificationsPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class NotificationsPersistenceService: NotificationsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Notification> = Notification.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let notifications = try self.managedObjectContext.fetch(request)
+                    for notification in notifications {
+                        self.managedObjectContext.delete(notification)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("NotificationsPersistenceService :: failed delete all notification with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/ProfilesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/ProfilesPersistenceService.swift
index 8999e60f34..8518fb1165 100644
--- a/Stepic/Sources/Services/Models/Persistence/ProfilesPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/ProfilesPersistenceService.swift
@@ -5,6 +5,8 @@ import PromiseKit
 protocol ProfilesPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [Profile.IdType]) -> Guarantee<[Profile]>
     func fetch(id: Profile.IdType) -> Guarantee<Profile?>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class ProfilesPersistenceService: ProfilesPersistenceServiceProtocol {
@@ -30,6 +32,27 @@ final class ProfilesPersistenceService: ProfilesPersistenceServiceProtocol {
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Profile> = Profile.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let profiles = try self.managedObjectContext.fetch(request)
+                    for profile in profiles {
+                        self.managedObjectContext.delete(profile)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("ProfilesPersistenceService :: failed delete all profiles with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     private func fetchProfiles(ids: [Profile.IdType]) -> Guarantee<[Profile]> {
         Guarantee { seal in
             let idSubpredicates = ids.map { id in
@@ -37,7 +60,7 @@ final class ProfilesPersistenceService: ProfilesPersistenceServiceProtocol {
             }
             let compoundPredicate = NSCompoundPredicate(type: .or, subpredicates: idSubpredicates)
 
-            let request: NSFetchRequest<Profile> = Profile.fetchRequest()
+            let request: NSFetchRequest<Profile> = Profile.fetchRequest
             request.predicate = compoundPredicate
             request.sortDescriptors = Profile.defaultSortDescriptors
             request.returnsObjectsAsFaults = false
@@ -53,4 +76,8 @@ final class ProfilesPersistenceService: ProfilesPersistenceServiceProtocol {
             }
         }
     }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/ProgressesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/ProgressesPersistenceService.swift
index d7c6e4f954..f85b8b6b2d 100644
--- a/Stepic/Sources/Services/Models/Persistence/ProgressesPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/ProgressesPersistenceService.swift
@@ -1,19 +1,22 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol ProgressesPersistenceServiceProtocol: AnyObject {
-    func fetch(
-        ids: [Progress.IdType],
-        page: Int
-    ) -> Promise<([Progress], Meta)>
+    func fetch(ids: [Progress.IdType], page: Int) -> Promise<([Progress], Meta)>
     func fetch(id: Progress.IdType) -> Promise<Progress?>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class ProgressesPersistenceService: ProgressesPersistenceServiceProtocol {
-    func fetch(
-        ids: [Progress.IdType],
-        page: Int = 1
-    ) -> Promise<([Progress], Meta)> {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func fetch(ids: [Progress.IdType], page: Int = 1) -> Promise<([Progress], Meta)> {
         Promise { seal in
             Progress.fetchAsync(ids: ids).done { progresses in
                 seal.fulfill((progresses, Meta.oneAndOnlyPage))
@@ -33,7 +36,29 @@ final class ProgressesPersistenceService: ProgressesPersistenceServiceProtocol {
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Progress> = Progress.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let progresses = try self.managedObjectContext.fetch(request)
+                    for progress in progresses {
+                        self.managedObjectContext.delete(progress)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("ProgressesPersistenceService :: failed delete all progresses with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/SectionsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/SectionsPersistenceService.swift
index 280c16eba3..8b2082cd48 100644
--- a/Stepic/Sources/Services/Models/Persistence/SectionsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/SectionsPersistenceService.swift
@@ -1,12 +1,21 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol SectionsPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [Section.IdType]) -> Promise<[Section]>
     func fetch(id: Section.IdType) -> Promise<Section?>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class SectionsPersistenceService: SectionsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [Section.IdType]) -> Promise<[Section]> {
         Promise { seal in
             Section.fetchAsync(ids: ids).done { sections in
@@ -28,7 +37,29 @@ final class SectionsPersistenceService: SectionsPersistenceServiceProtocol {
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Section> = Section.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let sections = try self.managedObjectContext.fetch(request)
+                    for section in sections {
+                        self.managedObjectContext.delete(section)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("SectionsPersistenceService :: failed delete all sections with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/StepOptionsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/StepOptionsPersistenceService.swift
index 8c0be44c44..1091e19159 100644
--- a/Stepic/Sources/Services/Models/Persistence/StepOptionsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/StepOptionsPersistenceService.swift
@@ -1,14 +1,21 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol StepOptionsPersistenceServiceProtocol: AnyObject {
     func fetch(by stepID: Step.IdType) -> Promise<StepOptions?>
+    func deleteAll() -> Promise<Void>
 }
 
 final class StepOptionsPersistenceService: StepOptionsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
     private let stepsPersistenceService: StepsPersistenceServiceProtocol
 
-    init(stepsPersistenceService: StepsPersistenceServiceProtocol) {
+    init(
+        managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context,
+        stepsPersistenceService: StepsPersistenceServiceProtocol = StepsPersistenceService()
+    ) {
+        self.managedObjectContext = managedObjectContext
         self.stepsPersistenceService = stepsPersistenceService
     }
 
@@ -22,7 +29,29 @@ final class StepOptionsPersistenceService: StepOptionsPersistenceServiceProtocol
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<StepOptions> = StepOptions.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let stepOptions = try self.managedObjectContext.fetch(request)
+                    for stepOption in stepOptions {
+                        self.managedObjectContext.delete(stepOption)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("StepOptionsPersistenceService :: failed delete all step options with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/StepsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/StepsPersistenceService.swift
index dac9092af3..4a679a50cc 100644
--- a/Stepic/Sources/Services/Models/Persistence/StepsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/StepsPersistenceService.swift
@@ -1,11 +1,19 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol StepsPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [Step.IdType]) -> Promise<[Step]>
+    func deleteAll() -> Promise<Void>
 }
 
 final class StepsPersistenceService: StepsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [Step.IdType]) -> Promise<[Step]> {
         Promise { seal in
             Step.fetchAsync(ids: ids).done { steps in
@@ -17,7 +25,29 @@ final class StepsPersistenceService: StepsPersistenceServiceProtocol {
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Step> = Step.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let steps = try self.managedObjectContext.fetch(request)
+                    for step in steps {
+                        self.managedObjectContext.delete(step)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("StepsPersistenceService :: failed delete all steps with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/SubmissionsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/SubmissionsPersistenceService.swift
index 51321d5dc6..495d30f705 100644
--- a/Stepic/Sources/Services/Models/Persistence/SubmissionsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/SubmissionsPersistenceService.swift
@@ -8,6 +8,8 @@ protocol SubmissionsPersistenceServiceProtocol: AnyObject {
 
     func fetchAttemptSubmissions(attemptID: Attempt.IdType) -> Guarantee<[SubmissionEntity]>
     func deleteAttemptSubmissions(attemptID: Attempt.IdType) -> Guarantee<Void>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class SubmissionsPersistenceService: SubmissionsPersistenceServiceProtocol {
@@ -15,8 +17,8 @@ final class SubmissionsPersistenceService: SubmissionsPersistenceServiceProtocol
     private let attemptsPersistenceService: AttemptsPersistenceServiceProtocol
 
     init(
-        managedObjectContext: NSManagedObjectContext,
-        attemptsPersistenceService: AttemptsPersistenceServiceProtocol
+        managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context,
+        attemptsPersistenceService: AttemptsPersistenceServiceProtocol = AttemptsPersistenceService()
     ) {
         self.managedObjectContext = managedObjectContext
         self.attemptsPersistenceService = attemptsPersistenceService
@@ -123,6 +125,27 @@ final class SubmissionsPersistenceService: SubmissionsPersistenceServiceProtocol
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<SubmissionEntity> = SubmissionEntity.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let submissions = try self.managedObjectContext.fetch(request)
+                    for submission in submissions {
+                        self.managedObjectContext.delete(submission)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("SubmissionsPersistenceService :: failed delete all submissions with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     // MARK: Private API
 
     private func fetchAttempt(id: Attempt.IdType) -> Guarantee<AttemptEntity?> {
@@ -168,4 +191,8 @@ final class SubmissionsPersistenceService: SubmissionsPersistenceServiceProtocol
             }
         }
     }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/UnitsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/UnitsPersistenceService.swift
index e17a29a5b1..7fd928bd3d 100644
--- a/Stepic/Sources/Services/Models/Persistence/UnitsPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/UnitsPersistenceService.swift
@@ -1,12 +1,21 @@
+import CoreData
 import Foundation
 import PromiseKit
 
 protocol UnitsPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [Unit.IdType]) -> Promise<[Unit]>
     func fetch(id: Unit.IdType) -> Promise<Unit?>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class UnitsPersistenceService: UnitsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
     func fetch(ids: [Unit.IdType]) -> Promise<[Unit]> {
         Promise { seal in
             Unit.fetchAsync(ids: ids).done { units in
@@ -28,7 +37,29 @@ final class UnitsPersistenceService: UnitsPersistenceServiceProtocol {
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Unit> = Unit.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let units = try self.managedObjectContext.fetch(request)
+                    for unit in units {
+                        self.managedObjectContext.delete(unit)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("UnitsPersistenceService :: failed delete all units with error = \(error)")
+                    seal.reject(Error.fetchFailed)
+                }
+            }
+        }
+    }
+
     enum Error: Swift.Error {
         case fetchFailed
+        case deleteFailed
     }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/UserActivitiesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/UserActivitiesPersistenceService.swift
index 2661bc624d..e9bb1642f6 100644
--- a/Stepic/Sources/Services/Models/Persistence/UserActivitiesPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/UserActivitiesPersistenceService.swift
@@ -5,6 +5,8 @@ import PromiseKit
 protocol UserActivitiesPersistenceServiceProtocol: AnyObject {
     func fetch(ids: [UserActivityEntity.IdType]) -> Guarantee<[UserActivityEntity]>
     func fetch(id: UserActivityEntity.IdType) -> Guarantee<UserActivityEntity?>
+
+    func deleteAll() -> Promise<Void>
 }
 
 final class UserActivitiesPersistenceService: UserActivitiesPersistenceServiceProtocol {
@@ -30,6 +32,27 @@ final class UserActivitiesPersistenceService: UserActivitiesPersistenceServicePr
         }
     }
 
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<UserActivityEntity> = UserActivityEntity.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let userActivities = try self.managedObjectContext.fetch(request)
+                    for userActivity in userActivities {
+                        self.managedObjectContext.delete(userActivity)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("UserActivitiesPersistenceService :: failed delete all user activities = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
     private func fetchUserActivities(ids: [UserActivityEntity.IdType]) -> Guarantee<[UserActivityEntity]> {
         Guarantee { seal in
             let idSubpredicates = ids.map { id in
@@ -37,7 +60,7 @@ final class UserActivitiesPersistenceService: UserActivitiesPersistenceServicePr
             }
             let compoundPredicate = NSCompoundPredicate(type: .or, subpredicates: idSubpredicates)
 
-            let request: NSFetchRequest<UserActivityEntity> = UserActivityEntity.fetchRequest()
+            let request: NSFetchRequest<UserActivityEntity> = UserActivityEntity.fetchRequest
             request.predicate = compoundPredicate
             request.sortDescriptors = UserActivityEntity.defaultSortDescriptors
             request.returnsObjectsAsFaults = false
@@ -47,10 +70,14 @@ final class UserActivitiesPersistenceService: UserActivitiesPersistenceServicePr
                     let userActivities = try self.managedObjectContext.fetch(request)
                     seal(userActivities)
                 } catch {
-                    print("Error while fetching user activities = \(ids)")
+                    print("UserActivitiesPersistenceService :: failed fetch user activities = \(ids)")
                     seal([])
                 }
             }
         }
     }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
 }
diff --git a/Stepic/Sources/Services/Models/Persistence/UserCoursesPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/UserCoursesPersistenceService.swift
new file mode 100644
index 0000000000..9b4a960619
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/UserCoursesPersistenceService.swift
@@ -0,0 +1,107 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol UserCoursesPersistenceServiceProtocol: AnyObject {
+    func fetch(ids: [UserCourse.IdType]) -> Guarantee<[UserCourse]>
+    func fetch(courseID: Course.IdType) -> Guarantee<[UserCourse]>
+    func fetchAll() -> Guarantee<[UserCourse]>
+
+    func deleteAll() -> Promise<Void>
+}
+
+final class UserCoursesPersistenceService: UserCoursesPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func fetch(ids: [UserCourse.IdType]) -> Guarantee<[UserCourse]> {
+        Guarantee { seal in
+            let request: NSFetchRequest<UserCourse> = UserCourse.fetchRequest
+
+            let idSubpredicates = ids.map { id in
+                NSPredicate(format: "%K == %@", #keyPath(UserCourse.managedId), NSNumber(value: id))
+            }
+            let compoundPredicate = NSCompoundPredicate(type: .or, subpredicates: idSubpredicates)
+
+            request.predicate = compoundPredicate
+            request.sortDescriptors = UserCourse.defaultSortDescriptors
+
+            self.managedObjectContext.performAndWait {
+                do {
+                    let userCourses = try self.managedObjectContext.fetch(request)
+                    seal(userCourses)
+                } catch {
+                    print("UserCoursesPersistenceService :: failed fetch ids = \(ids)")
+                    seal([])
+                }
+            }
+        }
+    }
+
+    func fetch(courseID: Course.IdType) -> Guarantee<[UserCourse]> {
+        Guarantee { seal in
+            let request: NSFetchRequest<UserCourse> = UserCourse.fetchRequest
+            request.predicate = NSPredicate(
+                format: "%K == %@",
+                #keyPath(UserCourse.managedCourseId),
+                NSNumber(value: courseID)
+            )
+            request.sortDescriptors = UserCourse.defaultSortDescriptors
+
+            self.managedObjectContext.performAndWait {
+                do {
+                    let userCourses = try self.managedObjectContext.fetch(request)
+                    seal(userCourses)
+                } catch {
+                    print("UserCoursesPersistenceService :: failed fetch by course id = \(courseID)")
+                    seal([])
+                }
+            }
+        }
+    }
+
+    func fetchAll() -> Guarantee<[UserCourse]> {
+        Guarantee { seal in
+            let request: NSFetchRequest<UserCourse> = UserCourse.fetchRequest
+            request.sortDescriptors = UserCourse.defaultSortDescriptors
+
+            self.managedObjectContext.performAndWait {
+                do {
+                    let userCourses = try self.managedObjectContext.fetch(request)
+                    seal(userCourses)
+                } catch {
+                    print("UserCoursesPersistenceService :: failed fetch all")
+                    seal([])
+                }
+            }
+        }
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<UserCourse> = UserCourse.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let userCourses = try self.managedObjectContext.fetch(request)
+                    for userCourse in userCourses {
+                        self.managedObjectContext.delete(userCourse)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("UserCoursesPersistenceService :: failed delete all user courses with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/UsersPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/UsersPersistenceService.swift
index a5bf04971c..679aaa575c 100644
--- a/Stepic/Sources/Services/Models/Persistence/UsersPersistenceService.swift
+++ b/Stepic/Sources/Services/Models/Persistence/UsersPersistenceService.swift
@@ -37,7 +37,7 @@ final class UsersPersistenceService: UsersPersistenceServiceProtocol {
             }
             let compoundPredicate = NSCompoundPredicate(type: .or, subpredicates: idSubpredicates)
 
-            let request: NSFetchRequest<User> = User.fetchRequest()
+            let request: NSFetchRequest<User> = User.fetchRequest
             request.predicate = compoundPredicate
             request.sortDescriptors = User.defaultSortDescriptors
             request.returnsObjectsAsFaults = false
diff --git a/Stepic/Sources/Services/Models/Persistence/VideoURLsPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/VideoURLsPersistenceService.swift
new file mode 100644
index 0000000000..721cbc3989
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/VideoURLsPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol VideoURLsPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class VideoURLsPersistenceService: VideoURLsPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<VideoURL> = VideoURL.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let videoURLs = try self.managedObjectContext.fetch(request)
+                    for videoURL in videoURLs {
+                        self.managedObjectContext.delete(videoURL)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("VideoURLsPersistenceService :: failed delete all video URLs with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Models/Persistence/VideosPersistenceService.swift b/Stepic/Sources/Services/Models/Persistence/VideosPersistenceService.swift
new file mode 100644
index 0000000000..9068cc9133
--- /dev/null
+++ b/Stepic/Sources/Services/Models/Persistence/VideosPersistenceService.swift
@@ -0,0 +1,40 @@
+import CoreData
+import Foundation
+import PromiseKit
+
+protocol VideosPersistenceServiceProtocol: AnyObject {
+    func deleteAll() -> Promise<Void>
+}
+
+final class VideosPersistenceService: VideosPersistenceServiceProtocol {
+    private let managedObjectContext: NSManagedObjectContext
+
+    init(managedObjectContext: NSManagedObjectContext = CoreDataHelper.shared.context) {
+        self.managedObjectContext = managedObjectContext
+    }
+
+    func deleteAll() -> Promise<Void> {
+        Promise { seal in
+            let request: NSFetchRequest<Video> = Video.fetchRequest
+            self.managedObjectContext.performAndWait {
+                do {
+                    let videos = try self.managedObjectContext.fetch(request)
+                    for video in videos {
+                        self.managedObjectContext.delete(video)
+                    }
+
+                    try? self.managedObjectContext.save()
+
+                    seal.fulfill(())
+                } catch {
+                    print("VideosPersistenceService :: failed delete all videos with error = \(error)")
+                    seal.reject(Error.deleteFailed)
+                }
+            }
+        }
+    }
+
+    enum Error: Swift.Error {
+        case deleteFailed
+    }
+}
diff --git a/Stepic/Sources/Services/Managers/AutoplayStorageManager.swift b/Stepic/Sources/Services/StorageManagers/AutoplayStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/AutoplayStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/AutoplayStorageManager.swift
diff --git a/Stepic/Sources/Services/Managers/DiscussionsSortTypeStorageManager.swift b/Stepic/Sources/Services/StorageManagers/DiscussionsSortTypeStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/DiscussionsSortTypeStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/DiscussionsSortTypeStorageManager.swift
diff --git a/Stepic/Sources/Services/Managers/StepFontSizeStorageManager.swift b/Stepic/Sources/Services/StorageManagers/StepFontSizeStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/StepFontSizeStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/StepFontSizeStorageManager.swift
diff --git a/Stepic/Sources/Services/Managers/TooltipStorageManager.swift b/Stepic/Sources/Services/StorageManagers/TooltipStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/TooltipStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/TooltipStorageManager.swift
diff --git a/Stepic/Sources/Services/Managers/UseCellularDataForDownloadsStorageManager.swift b/Stepic/Sources/Services/StorageManagers/UseCellularDataForDownloadsStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/UseCellularDataForDownloadsStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/UseCellularDataForDownloadsStorageManager.swift
diff --git a/Stepic/Sources/Services/Managers/Video/DownloadVideoQualityStorageManager.swift b/Stepic/Sources/Services/StorageManagers/Video/DownloadVideoQualityStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/Video/DownloadVideoQualityStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/Video/DownloadVideoQualityStorageManager.swift
diff --git a/Stepic/Sources/Services/Managers/Video/StreamVideoQualityStorageManager.swift b/Stepic/Sources/Services/StorageManagers/Video/StreamVideoQualityStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/Video/StreamVideoQualityStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/Video/StreamVideoQualityStorageManager.swift
diff --git a/Stepic/Sources/Services/Managers/Video/VideoRateStorageManager.swift b/Stepic/Sources/Services/StorageManagers/Video/VideoRateStorageManager.swift
similarity index 100%
rename from Stepic/Sources/Services/Managers/Video/VideoRateStorageManager.swift
rename to Stepic/Sources/Services/StorageManagers/Video/VideoRateStorageManager.swift
diff --git a/Stepic/Sources/Services/UserCoursesObserver.swift b/Stepic/Sources/Services/UserCoursesObserver.swift
new file mode 100644
index 0000000000..9bfefb02c3
--- /dev/null
+++ b/Stepic/Sources/Services/UserCoursesObserver.swift
@@ -0,0 +1,93 @@
+import Foundation
+
+protocol UserCoursesObserverProtocol: AnyObject {
+    func startObserving()
+    func stopObserving()
+}
+
+final class UserCoursesObserver: UserCoursesObserverProtocol {
+    private let dataBackUpdateService: DataBackUpdateServiceProtocol
+    private let debouncer: DebouncerProtocol
+
+    private var updatedUserCoursesMap: [Course.IdType: UserCourse] = [:]
+
+    private let synchronizationQueue = DispatchQueue(
+        label: "com.AlexKarpov.Stepic.UserCoursesObserverQueue",
+        qos: .background
+    )
+    private let semaphore = DispatchSemaphore(value: 1)
+
+    init(
+        dataBackUpdateService: DataBackUpdateServiceProtocol = DataBackUpdateService(
+            unitsNetworkService: UnitsNetworkService(unitsAPI: UnitsAPI()),
+            sectionsNetworkService: SectionsNetworkService(sectionsAPI: SectionsAPI()),
+            coursesNetworkService: CoursesNetworkService(coursesAPI: CoursesAPI()),
+            progressesNetworkService: ProgressesNetworkService(progressesAPI: ProgressesAPI())
+        ),
+        debouncer: DebouncerProtocol = Debouncer()
+    ) {
+        self.dataBackUpdateService = dataBackUpdateService
+        self.debouncer = debouncer
+    }
+
+    func startObserving() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.handleNotification(_:)),
+            name: .userCourseDidChangeNotification,
+            object: nil
+        )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.handleNotification(_:)),
+            name: .userCourseDidCreateNotification,
+            object: nil
+        )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(self.handleNotification(_:)),
+            name: .userCourseDidDeleteNotification,
+            object: nil
+        )
+    }
+
+    func stopObserving() {
+        NotificationCenter.default.removeObserver(self)
+    }
+
+    @objc
+    private func handleNotification(_ notification: Foundation.Notification) {
+        guard let targetUserCourse = notification.object as? UserCourse else {
+            return
+        }
+
+        self.synchronizationQueue.async {
+            self.semaphore.wait()
+
+            self.updatedUserCoursesMap[targetUserCourse.courseID] = targetUserCourse
+
+            DispatchQueue.main.async {
+                self.debouncer.action = { [weak self] in
+                    self?.triggerUserCoursesUpdate()
+                }
+                self.semaphore.signal()
+            }
+        }
+    }
+
+    private func triggerUserCoursesUpdate() {
+        self.synchronizationQueue.async {
+            self.semaphore.wait()
+
+            for updatedUserCourse in Array(self.updatedUserCoursesMap.values) {
+                DispatchQueue.main.async {
+                    self.dataBackUpdateService.triggerUserCourseUpdate(updatedUserCourse: updatedUserCourse)
+                }
+            }
+
+            self.updatedUserCoursesMap.removeAll(keepingCapacity: true)
+
+            self.semaphore.signal()
+        }
+    }
+}
diff --git a/Stepic/en.lproj/Localizable.strings b/Stepic/en.lproj/Localizable.strings
index d8140cf239..e9e7dcbc51 100644
--- a/Stepic/en.lproj/Localizable.strings
+++ b/Stepic/en.lproj/Localizable.strings
@@ -968,6 +968,9 @@ EditStepMessage = "You can only edit the step's text, and only using raw HTML. T
 EditStepRemoteUpdateSuccessfulTitle = "Updated";
 EditStepRemoteUpdateUnsuccessfulTitle = "Failed to update";
 
+/* Course List */
+CourseWidgetArchived = "Archived";
+
 /* Accessibility */
 StepVideoPreviewAccessibilityLabel = "Video preview";
 StepVideoPreviewAccessibilityHint = "Double-tap to start playing the video";
diff --git a/Stepic/ru.lproj/Localizable.strings b/Stepic/ru.lproj/Localizable.strings
index 2fdb900343..93f19da7e4 100644
--- a/Stepic/ru.lproj/Localizable.strings
+++ b/Stepic/ru.lproj/Localizable.strings
@@ -969,6 +969,9 @@ EditStepMessage = "Вы можете редактировать только т
 EditStepRemoteUpdateSuccessfulTitle = "Обновлено";
 EditStepRemoteUpdateUnsuccessfulTitle = "Не удалось обновить";
 
+/* Course List */
+CourseWidgetArchived = "В архиве";
+
 /* Accessibility */
 StepVideoPreviewAccessibilityLabel = "Просмотр видео";
 StepVideoPreviewAccessibilityHint = "Коснитесь дважды для начала воспроизведения видео";
diff --git a/StepicTests/Info.plist b/StepicTests/Info.plist
index 6e3800dbf1..56ad6841ff 100644
--- a/StepicTests/Info.plist
+++ b/StepicTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.126</string>
+	<string>1.127</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>216</string>
+	<string>219</string>
 </dict>
 </plist>
diff --git a/StickerPackExtension/Info.plist b/StickerPackExtension/Info.plist
index 1f55d3231b..55e264ee80 100644
--- a/StickerPackExtension/Info.plist
+++ b/StickerPackExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.126</string>
+	<string>1.127</string>
 	<key>CFBundleVersion</key>
-	<string>216</string>
+	<string>219</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 96481f7091..be3003b344 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1,5 +1,5 @@
 # This is the minimum version number required.
-fastlane_version "2.148.1"
+fastlane_version "2.149.1"
 
 default_platform :ios
 
diff --git a/fastlane/release-notes.txt b/fastlane/release-notes.txt
index be3f545a6d..9ca2d5e802 100644
--- a/fastlane/release-notes.txt
+++ b/fastlane/release-notes.txt
@@ -1,4 +1,5 @@
 Что тестировать:
-- В расписании курса для загруженных материалов должна отображаться иконка галочки, а не иконка с корзины APPS-2883.
-- Отображение большего числа карточек курсов на больших экранах в горизонтальных списках APPS-2877.
-- Отображение большего числа карточек курсов на больших экранах в вертикальных списках APPS-2878.
+- Обновление карточек курсов APPS-2889.
+- При изменении состояния записи на курс не обновляется список моих курсов APPS-2891.
+- В редактор кода подгружается решение от предыдущего пользователя, решавшего на этом устройстве APPS-2894.
+- Краш при повороте экрана в курслистах APPS-2900.
\ No newline at end of file