diff --git a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
index a5a2c9ef79..15fecf10eb 100644
--- a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
@@ -78,7 +78,7 @@ private enum ChannelAdminEntryStableId: Hashable {
 }
 
 private enum ChannelAdminEntry: ItemListNodeEntry {
-    case info(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, Peer, TelegramUserPresence?)
+    case info(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, EnginePeer, EnginePeer.Presence?)
     case rankTitle(PresentationTheme, String, Int32?, Int32)
     case rank(PresentationTheme, PresentationStrings, String, String, Bool)
     case rankInfo(PresentationTheme, String, Bool)
@@ -144,7 +144,7 @@ private enum ChannelAdminEntry: ItemListNodeEntry {
                     if lhsDateTimeFormat != rhsDateTimeFormat {
                         return false
                     }
-                    if !arePeersEqual(lhsPeer, rhsPeer) {
+                    if lhsPeer != rhsPeer {
                         return false
                     }
                     if lhsPresence != rhsPresence {
@@ -309,7 +309,7 @@ private enum ChannelAdminEntry: ItemListNodeEntry {
         let arguments = arguments as! ChannelAdminControllerArguments
         switch self {
             case let .info(_, _, dateTimeFormat, peer, presence):
-                return ItemListAvatarAndNameInfoItem(accountContext: arguments.context, presentationData: presentationData, dateTimeFormat: dateTimeFormat, mode: .generic, peer: EnginePeer(peer), presence: presence.flatMap(EnginePeer.Presence.init), memberCount: nil, state: ItemListAvatarAndNameInfoItemState(), sectionId: self.section, style: .blocks(withTopInset: true, withExtendedBottomInset: false), editingNameUpdated: { _ in
+                return ItemListAvatarAndNameInfoItem(accountContext: arguments.context, presentationData: presentationData, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: presence, memberCount: nil, state: ItemListAvatarAndNameInfoItemState(), sectionId: self.section, style: .blocks(withTopInset: true, withExtendedBottomInset: false), editingNameUpdated: { _ in
                 }, avatarTapped: {
                 })
             case let .rankTitle(_, text, count, limit):
@@ -534,11 +534,11 @@ private func areAllAdminRightsEnabled(_ flags: TelegramChatAdminRightsFlags, gro
     }
 }
 
-private func channelAdminControllerEntries(presentationData: PresentationData, state: ChannelAdminControllerState, accountPeerId: PeerId, channelView: PeerView, adminView: PeerView, initialParticipant: ChannelParticipant?, invite: Bool, canEdit: Bool) -> [ChannelAdminEntry] {
+private func channelAdminControllerEntries(presentationData: PresentationData, state: ChannelAdminControllerState, accountPeerId: PeerId, channelPeer: EnginePeer?, adminPeer: EnginePeer?, adminPresence: EnginePeer.Presence?, initialParticipant: ChannelParticipant?, invite: Bool, canEdit: Bool) -> [ChannelAdminEntry] {
     var entries: [ChannelAdminEntry] = []
     
-    if let channel = channelView.peers[channelView.peerId] as? TelegramChannel, let admin = adminView.peers[adminView.peerId] {
-        entries.append(.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, admin, adminView.peerPresences[admin.id] as? TelegramUserPresence))
+    if case let .channel(channel) = channelPeer, let admin = adminPeer {
+        entries.append(.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, admin, adminPresence))
 
         var isChannel = false
         if case .broadcast = channel.info {
@@ -618,7 +618,7 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
                 }
             }
         } else {
-            if let adminPeer = adminView.peers[adminView.peerId] as? TelegramUser, adminPeer.botInfo != nil, case .group = channel.info, invite, let channelPeer = channelView.peers[channelView.peerId], canEditAdminRights(accountPeerId: accountPeerId, channelPeer: channelPeer, initialParticipant: initialParticipant) {
+            if case let .user(adminPeer) = adminPeer, adminPeer.botInfo != nil, case .group = channel.info, invite, let channelPeer = channelPeer, canEditAdminRights(accountPeerId: accountPeerId, channelPeer: channelPeer._asPeer(), initialParticipant: initialParticipant) {
                 if let initialParticipant = initialParticipant, case let .member(_, _, adminInfo, _, _) = initialParticipant, adminInfo != nil {
                     
                 } else {
@@ -629,7 +629,7 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
             if !invite || state.adminRights {
                 entries.append(.rightsTitle(presentationData.theme, presentationData.strings.Channel_EditAdmin_PermissionsHeader))
             
-                if let channelPeer = channelView.peers[channelView.peerId], canEditAdminRights(accountPeerId: accountPeerId, channelPeer: channelPeer, initialParticipant: initialParticipant) {
+                if let channelPeer = channelPeer, canEditAdminRights(accountPeerId: accountPeerId, channelPeer: channelPeer._asPeer(), initialParticipant: initialParticipant) {
                     let accountUserRightsFlags: TelegramChatAdminRightsFlags
                     if channel.flags.contains(.isCreator) {
                         accountUserRightsFlags = maskRightsFlags
@@ -660,7 +660,7 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
                         entries.append(.addAdminsInfo(presentationData.theme, currentRightsFlags.contains(.canAddAdmins) ? presentationData.strings.Channel_EditAdmin_PermissinAddAdminOn : presentationData.strings.Channel_EditAdmin_PermissinAddAdminOff))
                     }
                     
-                    if let admin = admin as? TelegramUser, admin.botInfo == nil && !admin.isDeleted && channel.flags.contains(.isCreator) && areAllAdminRightsEnabled(currentRightsFlags, group: isGroup, except: .canBeAnonymous) {
+                    if case let .user(admin) = admin, admin.botInfo == nil && !admin.isDeleted && channel.flags.contains(.isCreator) && areAllAdminRightsEnabled(currentRightsFlags, group: isGroup, except: .canBeAnonymous) {
                         canTransfer = true
                     }
                 
@@ -717,8 +717,8 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
         if canDismiss {
             entries.append(.dismiss(presentationData.theme, presentationData.strings.Channel_Moderator_AccessLevelRevoke))
         }
-    } else if let group = channelView.peers[channelView.peerId] as? TelegramGroup, let admin = adminView.peers[adminView.peerId] {
-        entries.append(.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, admin, adminView.peerPresences[admin.id] as? TelegramUserPresence))
+    } else if case let .legacyGroup(group) = channelPeer, let admin = adminPeer {
+        entries.append(.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, admin, adminPresence))
         
         var isCreator = false
         if let initialParticipant = initialParticipant, case .creator = initialParticipant {
@@ -738,7 +738,7 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
             entries.append(.rankTitle(presentationData.theme, presentationData.strings.Group_EditAdmin_RankTitle.uppercased(), rankEnabled && state.focusedOnRank ? Int32(currentRank?.count ?? 0) : nil, rankMaxLength))
             entries.append(.rank(presentationData.theme, presentationData.strings, isCreator ? presentationData.strings.Group_EditAdmin_RankOwnerPlaceholder : presentationData.strings.Group_EditAdmin_RankAdminPlaceholder, currentRank ?? "", rankEnabled))
         } else {
-            if let adminPeer = adminView.peers[adminView.peerId] as? TelegramUser, adminPeer.botInfo != nil, invite {
+            if case let .user(adminPeer) = adminPeer, adminPeer.botInfo != nil, invite {
                 if let initialParticipant = initialParticipant, case let .member(_, _, adminRights, _, _) = initialParticipant, adminRights != nil {
                     
                 } else {
@@ -791,7 +791,7 @@ private func channelAdminControllerEntries(presentationData: PresentationData, s
                     entries.append(.addAdminsInfo(presentationData.theme, currentRightsFlags.contains(.canAddAdmins) ? presentationData.strings.Channel_EditAdmin_PermissinAddAdminOn : presentationData.strings.Channel_EditAdmin_PermissinAddAdminOff))
                 }
             
-                if let admin = admin as? TelegramUser, case .creator = group.role, admin.botInfo == nil && !admin.isDeleted && areAllAdminRightsEnabled(currentRightsFlags, group: true, except: .canBeAnonymous) {
+                if case let .user(admin) = admin, case .creator = group.role, admin.botInfo == nil && !admin.isDeleted && areAllAdminRightsEnabled(currentRightsFlags, group: true, except: .canBeAnonymous) {
                     entries.append(.transfer(presentationData.theme, presentationData.strings.Group_EditAdmin_TransferOwnership))
                 }
                 
@@ -955,15 +955,23 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
         errorImpl?()
     })
     
-    let combinedView = context.account.postbox.combinedView(keys: [.peer(peerId: peerId, components: .all), .peer(peerId: adminId, components: .all)])
-    
     let presentationData = updatedPresentationData?.signal ?? context.sharedContext.presentationData
-    let signal = combineLatest(presentationData, statePromise.get(), combinedView)
+    let signal = combineLatest(
+        queue: .mainQueue(),
+        presentationData,
+        statePromise.get(),
+        context.engine.data.subscribe(
+            TelegramEngine.EngineData.Item.Peer.Peer(id: peerId),
+            TelegramEngine.EngineData.Item.Peer.Peer(id: adminId),
+            TelegramEngine.EngineData.Item.Peer.Presence(id: adminId)
+        )
+    )
     |> deliverOnMainQueue
-    |> map { presentationData, state, combinedView -> (ItemListControllerState, (ItemListNodeState, Any)) in
-        let channelView = combinedView.views[.peer(peerId: peerId, components: .all)] as! PeerView
-        let adminView = combinedView.views[.peer(peerId: adminId, components: .all)] as! PeerView
-        let canEdit = canEditAdminRights(accountPeerId: context.account.peerId, channelPeer: channelView.peers[channelView.peerId]!, initialParticipant: initialParticipant)
+    |> map { presentationData, state, peerInfoData -> (ItemListControllerState, (ItemListNodeState, Any)) in
+        let channelPeer = peerInfoData.0.flatMap { $0 }
+        let adminPeer = peerInfoData.1.flatMap { $0 }
+        let adminPresence = peerInfoData.2
+        let canEdit = canEditAdminRights(accountPeerId: context.account.peerId, channelPeer: channelPeer!._asPeer(), initialParticipant: initialParticipant)
         
         let leftNavigationButton: ItemListNavigationButton
         if canEdit {
@@ -986,8 +994,9 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                 updateState { current in
                     return current.withUpdatedUpdating(true)
                 }
-                if let channel = channelView.peers[channelView.peerId] as? TelegramChannel {
-                    updateRightsDisposable.set((context.engine.peers.addChannelMember(peerId: peerId, memberId: adminId) |> deliverOnMainQueue).start(error: { error in
+                if case let .channel(channel) = channelPeer {
+                    updateRightsDisposable.set((context.engine.peers.addChannelMember(peerId: peerId, memberId: adminId)
+                    |> deliverOnMainQueue).start(error: { error in
                         updateState { current in
                             return current.withUpdatedUpdating(false)
                         }
@@ -998,12 +1007,12 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                         case .tooMuchJoined:
                             text = presentationData.strings.Group_ErrorSupergroupConversionNotPossible
                         case .restricted:
-                            if let admin = adminView.peers[adminView.peerId] {
+                            if let admin = adminPeer {
                                 switch channel.info {
                                     case .broadcast:
-                                        text = presentationData.strings.Privacy_GroupsAndChannels_InviteToChannelError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string
+                                        text = presentationData.strings.Privacy_GroupsAndChannels_InviteToChannelError(admin.compactDisplayTitle, admin.compactDisplayTitle).string
                                     case .group:
-                                        text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string
+                                        text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).string
                                 }
                             }
                         case .notMutualContact:
@@ -1020,20 +1029,20 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                         updated(nil)
                         dismissImpl?()
                     }))
-                } else if let _ = channelView.peers[channelView.peerId] as? TelegramGroup {
+                } else if case .legacyGroup = channelPeer {
                     updateRightsDisposable.set((context.engine.peers.addGroupMember(peerId: peerId, memberId: adminId) |> deliverOnMainQueue).start(error: { error in
                         updateState { current in
                             return current.withUpdatedUpdating(false)
                         }
-                        if case .privacy = error, let admin = adminView.peers[adminView.peerId] {
-                            presentControllerImpl?(textAlertController(context: context, updatedPresentationData: updatedPresentationData, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+                        if case .privacy = error, let admin = adminPeer {
+                            presentControllerImpl?(textAlertController(context: context, updatedPresentationData: updatedPresentationData, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).string, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
                         }
                     }, completed: {
                         updated(nil)
                         dismissImpl?()
                     }))
                 }
-            } else if let channel = channelView.peers[channelView.peerId] as? TelegramChannel {
+            } else if case let .channel(channel) = channelPeer {
                 if let initialParticipant = initialParticipant {
                     var updateFlags: TelegramChatAdminRightsFlags?
                     var updateRank: String?
@@ -1105,12 +1114,12 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                                 case .tooMuchJoined:
                                     text = presentationData.strings.Group_ErrorSupergroupConversionNotPossible
                                 case .restricted:
-                                    if let admin = adminView.peers[adminView.peerId] {
+                                    if let admin = adminPeer {
                                         switch channel.info {
                                             case .broadcast:
-                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToChannelError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string
+                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToChannelError(admin.compactDisplayTitle, admin.compactDisplayTitle).string
                                             case .group:
-                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string
+                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).string
                                         }
                                     }
                                 case .notMutualContact:
@@ -1184,7 +1193,7 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                             return current.withUpdatedUpdating(true)
                         }
                         updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: updateFlags), rank: updateRank) |> deliverOnMainQueue).start(error: { error in
-                            if case let .addMemberError(addMemberError) = error, let admin = adminView.peers[adminView.peerId] {
+                            if case let .addMemberError(addMemberError) = error, let admin = adminPeer {
                                 var text = presentationData.strings.Login_UnknownError
                                 switch addMemberError {
                                     case .tooMuchJoined:
@@ -1192,9 +1201,9 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                                     case .restricted:
                                         switch channel.info {
                                             case .broadcast:
-                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToChannelError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string
+                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToChannelError(admin.compactDisplayTitle, admin.compactDisplayTitle).string
                                             case .group:
-                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string
+                                                text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).string
                                         }
                                     case .notMutualContact:
                                         if case .broadcast = channel.info {
@@ -1222,7 +1231,7 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                         }))
                     }
                 }
-            } else if let _ = channelView.peers[channelView.peerId] as? TelegramGroup {
+            } else if case .legacyGroup = channelPeer {
                 var updateFlags: TelegramChatAdminRightsFlags?
                 var updateRank: String?
                 updateState { current in
@@ -1252,8 +1261,8 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                         }
                         updateRightsDisposable.set((context.engine.peers.addGroupAdmin(peerId: peerId, adminId: adminId)
                         |> deliverOnMainQueue).start(error: { error in
-                            if case let .addMemberError(error) = error, case .privacy = error, let admin = adminView.peers[adminView.peerId] {
-                                presentControllerImpl?(textAlertController(context: context, updatedPresentationData: updatedPresentationData, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+                            if case let .addMemberError(error) = error, case .privacy = error, let admin = adminPeer {
+                                presentControllerImpl?(textAlertController(context: context, updatedPresentationData: updatedPresentationData, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).string, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
                             } else if case .adminsTooMuch = error {
                                 presentControllerImpl?(textAlertController(context: context, updatedPresentationData: updatedPresentationData, title: nil, text: presentationData.strings.Group_ErrorAdminsTooMuch, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
                             }
@@ -1312,8 +1321,8 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
                             case let .direct(error):
                                 if case let .addMemberError(error) = error {
                                     var text = presentationData.strings.Login_UnknownError
-                                    if case .restricted = error, let admin = adminView.peers[adminView.peerId] {
-                                        text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(EnginePeer(admin).compactDisplayTitle, EnginePeer(admin).compactDisplayTitle).string
+                                    if case .restricted = error, let admin = adminPeer {
+                                        text = presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).string
                                     } else if case .tooMuchJoined = error {
                                         text = presentationData.strings.Invite_ChannelsTooMuch
                                     } else if case .kicked = error {
@@ -1353,17 +1362,17 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
         if initialParticipant?.adminInfo == nil {
             var isGroup: Bool = false
             var peerTitle: String = ""
-            if let peer = channelView.peers[channelView.peerId] as? TelegramGroup {
+            if case let .legacyGroup(peer) = channelPeer {
                 isGroup = true
                 peerTitle = peer.title
-            } else if let peer = channelView.peers[channelView.peerId] as? TelegramChannel {
+            } else if case let .channel(peer) = channelPeer {
                 if case .group = peer.info {
                     isGroup = true
                 }
                 peerTitle = peer.title
             }
                 
-            if let admin = adminView.peers[adminView.peerId] as? TelegramUser, admin.botInfo != nil && invite {
+            if case let .user(admin) = adminPeer, admin.botInfo != nil && invite {
                 title = presentationData.strings.Bot_AddToChat_Add_Title
                 rightNavigationButton = nil
                 footerItem = ChannelAdminAddBotFooterItem(theme: presentationData.theme, title: state.adminRights ? presentationData.strings.Bot_AddToChat_Add_AddAsAdmin : presentationData.strings.Bot_AddToChat_Add_AddAsMember, action: {
@@ -1395,7 +1404,7 @@ public func channelAdminController(context: AccountContext, updatedPresentationD
         
         let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(title), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
         
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: channelAdminControllerEntries(presentationData: presentationData, state: state, accountPeerId: context.account.peerId, channelView: channelView, adminView: adminView, initialParticipant: initialParticipant, invite: invite, canEdit: canEdit), style: .blocks, focusItemTag: focusItemTag, ensureVisibleItemTag: nil, emptyStateItem: nil, footerItem: footerItem, animateChanges: true)
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: channelAdminControllerEntries(presentationData: presentationData, state: state, accountPeerId: context.account.peerId, channelPeer: channelPeer, adminPeer: adminPeer, adminPresence: adminPresence, initialParticipant: initialParticipant, invite: invite, canEdit: canEdit), style: .blocks, focusItemTag: focusItemTag, ensureVisibleItemTag: nil, emptyStateItem: nil, footerItem: footerItem, animateChanges: true)
         
         return (controllerState, (listState, arguments))
     }
diff --git a/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift b/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift
index 74598d3c98..c27429b812 100644
--- a/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift	
+++ b/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift	
@@ -417,10 +417,17 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
             })
         }
         
-        let preferencesKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.localizationListState]))
         let previousState = Atomic<LocalizationListState?>(value: nil)
         let previousEntriesHolder = Atomic<([LanguageListEntry], PresentationTheme, PresentationStrings)?>(value: nil)
-        self.listDisposable = combineLatest(queue: .mainQueue(), context.account.postbox.combinedView(keys: [preferencesKey]), context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.localizationSettings, ApplicationSpecificSharedDataKeys.translationSettings]), self.presentationDataValue.get(), self.applyingCode.get(), revealedCode.get(), self.isEditing.get()).start(next: { [weak self] view, sharedData, presentationData, applyingCode, revealedCode, isEditing in
+        self.listDisposable = combineLatest(
+            queue: .mainQueue(),
+            context.engine.data.subscribe(TelegramEngine.EngineData.Item.Configuration.LocalizationList()),
+            context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.localizationSettings, ApplicationSpecificSharedDataKeys.translationSettings]),
+            self.presentationDataValue.get(),
+            self.applyingCode.get(),
+            revealedCode.get(),
+            self.isEditing.get()
+        ).start(next: { [weak self] localizationListState, sharedData, presentationData, applyingCode, revealedCode, isEditing in
             guard let strongSelf = self else {
                 return
             }
@@ -449,8 +456,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
                 }
             }
             
-            let localizationListState = (view.views[preferencesKey] as? PreferencesView)?.values[PreferencesKeys.localizationListState]?.get(LocalizationListState.self)
-            if let localizationListState = localizationListState, !localizationListState.availableOfficialLocalizations.isEmpty {
+            if !localizationListState.availableOfficialLocalizations.isEmpty {
                 strongSelf.currentListState = localizationListState
                 
                 if #available(iOS 12.0, *) {
@@ -520,7 +526,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
                 if let strongSelf = self {
                     strongSelf.push(translationSettingsController(context: strongSelf.context))
                 }
-            }, selectLocalization: { [weak self] info in self?.selectLocalization(info) }, setItemWithRevealedOptions: setItemWithRevealedOptions, removeItem: removeItem, firstTime: previousEntriesAndPresentationData == nil, isLoading: entries.isEmpty, forceUpdate: previousEntriesAndPresentationData?.1 !== presentationData.theme || previousEntriesAndPresentationData?.2 !== presentationData.strings, animated: (previousEntriesAndPresentationData?.0.count ?? 0) != entries.count, crossfade: (previousState == nil) != (localizationListState == nil))
+            }, selectLocalization: { [weak self] info in self?.selectLocalization(info) }, setItemWithRevealedOptions: setItemWithRevealedOptions, removeItem: removeItem, firstTime: previousEntriesAndPresentationData == nil, isLoading: entries.isEmpty, forceUpdate: previousEntriesAndPresentationData?.1 !== presentationData.theme || previousEntriesAndPresentationData?.2 !== presentationData.strings, animated: (previousEntriesAndPresentationData?.0.count ?? 0) != entries.count, crossfade: (previousState == nil || previousState!.availableOfficialLocalizations.isEmpty) != localizationListState.availableOfficialLocalizations.isEmpty)
             strongSelf.enqueueTransition(transition)
         })
         self.updatedDisposable = context.engine.localization.synchronizedLocalizationListState().start()
diff --git a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift
index 280e2063ea..e58d5cf3a7 100644
--- a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift
@@ -1170,32 +1170,28 @@ private final class NotificationExceptionsSearchContainerNode: SearchDisplayCont
         let updateNotificationsDisposable = self.updateNotificationsDisposable
         
         let updateNotificationsView: (@escaping () -> Void) -> Void = { completion in
-            let key: PostboxViewKey = .peerNotificationSettings(peerIds: Set(mode.peerIds))
-            
-            updateNotificationsDisposable.set(context.account.postbox.combinedView(keys: [key]).start(next: { view in
-                if let view = view.views[key] as? PeerNotificationSettingsView {
-                    let _ = (context.engine.data.get(
-                        EngineDataMap(view.notificationSettings.keys.map(TelegramEngine.EngineData.Item.Peer.Peer.init)),
-                        EngineDataMap(view.notificationSettings.keys.map(TelegramEngine.EngineData.Item.Peer.NotificationSettings.init))
-                    )
-                    |> deliverOnMainQueue).start(next: { peerMap, notificationSettingsMap in
-                        updateState { current in
-                            var current = current
-                            for (key, value) in view.notificationSettings {
-                                if let value = value as? TelegramPeerNotificationSettings,let local = current.mode.settings[key] {
-                                    if !value.isEqual(to: local.settings), let maybePeer = peerMap[key], let peer = maybePeer, let settings = notificationSettingsMap[key], !settings._asNotificationSettings().isEqual(to: local.settings) {
-                                        current = current.withUpdatedPeerSound(peer._asPeer(), settings.messageSound._asMessageSound()).withUpdatedPeerMuteInterval(peer._asPeer(), settings.muteState.timeInterval)
-                                    }
+            updateNotificationsDisposable.set(context.engine.data.subscribe(EngineDataMap(
+                mode.peerIds.map(TelegramEngine.EngineData.Item.Peer.NotificationSettings.init)
+            )).start(next: { notificationSettingsMap in
+                let _ = (context.engine.data.get(
+                    EngineDataMap(notificationSettingsMap.keys.map(TelegramEngine.EngineData.Item.Peer.Peer.init)),
+                    EngineDataMap(notificationSettingsMap.keys.map(TelegramEngine.EngineData.Item.Peer.NotificationSettings.init))
+                )
+                |> deliverOnMainQueue).start(next: { peerMap, notificationSettingsMap in
+                    updateState { current in
+                        var current = current
+                        for (key, value) in notificationSettingsMap {
+                            if let local = current.mode.settings[key] {
+                                if !value._asNotificationSettings().isEqual(to: local.settings), let maybePeer = peerMap[key], let peer = maybePeer, let settings = notificationSettingsMap[key], !settings._asNotificationSettings().isEqual(to: local.settings) {
+                                    current = current.withUpdatedPeerSound(peer._asPeer(), settings.messageSound._asMessageSound()).withUpdatedPeerMuteInterval(peer._asPeer(), settings.muteState.timeInterval)
                                 }
                             }
-                            return current
                         }
-                        
-                        completion()
-                    })
-                } else {
+                        return current
+                    }
+                    
                     completion()
-                }
+                })
             }))
         }
         
diff --git a/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift b/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
index 49a101158e..1b141cb6c1 100644
--- a/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
+++ b/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
@@ -775,11 +775,12 @@ func settingsSearchableItems(context: AccountContext, notificationExceptionsList
         return settings.servers
     }
     
-    let localizationPreferencesKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.localizationListState]))
-    let localizations = combineLatest(context.account.postbox.combinedView(keys: [localizationPreferencesKey]), context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.localizationSettings]))
-    |> map { view, sharedData -> [LocalizationInfo] in
-        if let localizationListState = (view.views[localizationPreferencesKey] as? PreferencesView)?.values[PreferencesKeys.localizationListState]?.get(LocalizationListState.self), !localizationListState.availableOfficialLocalizations.isEmpty {
-            
+    let localizations = combineLatest(
+        context.engine.data.subscribe(TelegramEngine.EngineData.Item.Configuration.LocalizationList()),
+        context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.localizationSettings])
+    )
+    |> map { localizationListState, sharedData -> [LocalizationInfo] in
+        if !localizationListState.availableOfficialLocalizations.isEmpty {
             var existingIds = Set<String>()
             let availableSavedLocalizations = localizationListState.availableSavedLocalizations.filter({ info in !localizationListState.availableOfficialLocalizations.contains(where: { $0.languageCode == info.languageCode }) })
             
diff --git a/submodules/ShareController/Sources/ShareController.swift b/submodules/ShareController/Sources/ShareController.swift
index 2986094052..db524dc28e 100644
--- a/submodules/ShareController/Sources/ShareController.swift
+++ b/submodules/ShareController/Sources/ShareController.swift
@@ -313,7 +313,7 @@ public final class ShareController: ViewController {
     private let segmentedValues: [ShareControllerSegmentedValue]?
     private let fromForeignApp: Bool
     
-    private let peers = Promise<([(EngineRenderedPeer, PeerPresence?)], EnginePeer)>()
+    private let peers = Promise<([(EngineRenderedPeer, EnginePeer.Presence?)], EnginePeer)>()
     private let peersDisposable = MetaDisposable()
     private let readyDisposable = MetaDisposable()
     private let accountActiveDisposable = MetaDisposable()
@@ -966,7 +966,7 @@ public final class ShareController: ViewController {
             self.currentAccount.viewTracker.tailChatListView(groupId: .root, count: 150)
             |> take(1)
         )
-        |> mapToSignal { maybeAccountPeer, view -> Signal<([(EngineRenderedPeer, PeerPresence?)], EnginePeer), NoError> in
+        |> mapToSignal { maybeAccountPeer, view -> Signal<([(EngineRenderedPeer, EnginePeer.Presence?)], EnginePeer), NoError> in
             let accountPeer = maybeAccountPeer!
             
             var peers: [EngineRenderedPeer] = []
@@ -980,14 +980,14 @@ public final class ShareController: ViewController {
                         break
                 }
             }
-            let key = PostboxViewKey.peerPresences(peerIds: Set(peers.map { $0.peerId }))
-            return account.postbox.combinedView(keys: [key])
-            |> map { views -> ([(EngineRenderedPeer, PeerPresence?)], EnginePeer) in
-                var resultPeers: [(EngineRenderedPeer, PeerPresence?)] = []
-                if let presencesView = views.views[key] as? PeerPresencesView {
-                    for peer in peers {
-                        resultPeers.append((peer, presencesView.presences[peer.peerId]))
-                    }
+
+            return TelegramEngine(account: account).data.subscribe(EngineDataMap(
+                peers.map { TelegramEngine.EngineData.Item.Peer.Presence(id: $0.peerId) }
+            ))
+            |> map { presenceMap -> ([(EngineRenderedPeer, EnginePeer.Presence?)], EnginePeer) in
+                var resultPeers: [(EngineRenderedPeer, EnginePeer.Presence?)] = []
+                for peer in peers {
+                    resultPeers.append((peer, presenceMap[peer.peerId].flatMap { $0 }))
                 }
                 return (resultPeers, accountPeer)
             }
diff --git a/submodules/ShareController/Sources/ShareControllerNode.swift b/submodules/ShareController/Sources/ShareControllerNode.swift
index 452a0ec17b..64ccea13ea 100644
--- a/submodules/ShareController/Sources/ShareControllerNode.swift
+++ b/submodules/ShareController/Sources/ShareControllerNode.swift
@@ -804,7 +804,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
         }
     }
     
-    func updatePeers(context: AccountContext, switchableAccounts: [AccountWithInfo], peers: [(EngineRenderedPeer, PeerPresence?)], accountPeer: EnginePeer, defaultAction: ShareControllerAction?) {
+    func updatePeers(context: AccountContext, switchableAccounts: [AccountWithInfo], peers: [(EngineRenderedPeer, EnginePeer.Presence?)], accountPeer: EnginePeer, defaultAction: ShareControllerAction?) {
         self.context = context
         
         if let peersContentNode = self.peersContentNode, peersContentNode.accountPeer.id == accountPeer.id {
diff --git a/submodules/ShareController/Sources/ShareControllerPeerGridItem.swift b/submodules/ShareController/Sources/ShareControllerPeerGridItem.swift
index 62d7eb5b16..fe273dfda5 100644
--- a/submodules/ShareController/Sources/ShareControllerPeerGridItem.swift
+++ b/submodules/ShareController/Sources/ShareControllerPeerGridItem.swift
@@ -91,13 +91,13 @@ final class ShareControllerPeerGridItem: GridItem {
     let theme: PresentationTheme
     let strings: PresentationStrings
     let peer: EngineRenderedPeer?
-    let presence: PeerPresence?
+    let presence: EnginePeer.Presence?
     let controllerInteraction: ShareControllerInteraction
     let search: Bool
     
     let section: GridSection?
     
-    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, peer: EngineRenderedPeer?, presence: PeerPresence?, controllerInteraction: ShareControllerInteraction, sectionTitle: String? = nil, search: Bool = false) {
+    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, peer: EngineRenderedPeer?, presence: EnginePeer.Presence?, controllerInteraction: ShareControllerInteraction, sectionTitle: String? = nil, search: Bool = false) {
         self.context = context
         self.theme = theme
         self.strings = strings
@@ -131,7 +131,7 @@ final class ShareControllerPeerGridItem: GridItem {
 }
 
 final class ShareControllerPeerGridItemNode: GridItemNode {
-    private var currentState: (AccountContext, PresentationTheme, PresentationStrings, EngineRenderedPeer?, Bool, PeerPresence?)?
+    private var currentState: (AccountContext, PresentationTheme, PresentationStrings, EngineRenderedPeer?, Bool, EnginePeer.Presence?)?
     private let peerNode: SelectablePeerNode
     private var presenceManager: PeerPresenceStatusManager?
     
@@ -171,14 +171,14 @@ final class ShareControllerPeerGridItemNode: GridItemNode {
         }
     }
     
-    func setup(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, peer: EngineRenderedPeer?, presence: PeerPresence?, search: Bool, synchronousLoad: Bool, force: Bool) {
-        if force || self.currentState == nil || self.currentState!.0 !== context || self.currentState!.3 != peer || !arePeerPresencesEqual(self.currentState!.5, presence) {
+    func setup(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, peer: EngineRenderedPeer?, presence: EnginePeer.Presence?, search: Bool, synchronousLoad: Bool, force: Bool) {
+        if force || self.currentState == nil || self.currentState!.0 !== context || self.currentState!.3 != peer || self.currentState!.5 != presence {
             let itemTheme = SelectablePeerNodeTheme(textColor: theme.actionSheet.primaryTextColor, secretTextColor: theme.chatList.secretTitleColor, selectedTextColor: theme.actionSheet.controlAccentColor, checkBackgroundColor: theme.actionSheet.opaqueItemBackgroundColor, checkFillColor: theme.actionSheet.controlAccentColor, checkColor: theme.actionSheet.checkContentColor, avatarPlaceholderColor: theme.list.mediaPlaceholderColor)
             
             let timestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970)
             var online = false
-            if case let .user(peer) = peer?.peer, let presence = presence as? TelegramUserPresence, !isServicePeer(peer) && !peer.flags.contains(.isSupport) && peer.id != context.account.peerId  {
-                let relativeStatus = relativeUserPresenceStatus(EnginePeer.Presence(presence), relativeTo: timestamp)
+            if case let .user(peer) = peer?.peer, let presence = presence, !isServicePeer(peer) && !peer.flags.contains(.isSupport) && peer.id != context.account.peerId  {
+                let relativeStatus = relativeUserPresenceStatus(presence, relativeTo: timestamp)
                 if case .online = relativeStatus {
                     online = true
                 }
@@ -220,8 +220,8 @@ final class ShareControllerPeerGridItemNode: GridItemNode {
             }
             self.currentState = (context, theme, strings, peer, search, presence)
             self.setNeedsLayout()
-            if let presence = presence as? TelegramUserPresence {
-                self.presenceManager?.reset(presence: EnginePeer.Presence(presence))
+            if let presence = presence {
+                self.presenceManager?.reset(presence: presence)
             }
         }
         self.updateSelection(animated: false)
diff --git a/submodules/ShareController/Sources/SharePeersContainerNode.swift b/submodules/ShareController/Sources/SharePeersContainerNode.swift
index ae3dcff4d3..aa1c8595a8 100644
--- a/submodules/ShareController/Sources/SharePeersContainerNode.swift
+++ b/submodules/ShareController/Sources/SharePeersContainerNode.swift
@@ -20,7 +20,7 @@ private let subtitleFont = Font.regular(12.0)
 private struct SharePeerEntry: Comparable, Identifiable {
     let index: Int32
     let peer: EngineRenderedPeer
-    let presence: PeerPresence?
+    let presence: EnginePeer.Presence?
     let theme: PresentationTheme
     let strings: PresentationStrings
     
@@ -35,13 +35,10 @@ private struct SharePeerEntry: Comparable, Identifiable {
         if lhs.peer != rhs.peer {
             return false
         }
-        if let lhsPresence = lhs.presence, let rhsPresence = rhs.presence {
-            if !lhsPresence.isEqual(to: rhsPresence) {
-                return false
-            }
-        } else if (lhs.presence != nil) != (rhs.presence != nil) {
+        if lhs.presence != rhs.presence {
             return false
         }
+        
         return true
     }
     
@@ -115,9 +112,9 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode {
     private var validLayout: (CGSize, CGFloat)?
     private var overrideGridOffsetTransition: ContainedViewLayoutTransition?
     
-    let peersValue = Promise<[(EngineRenderedPeer, PeerPresence?)]>()
+    let peersValue = Promise<[(EngineRenderedPeer, EnginePeer.Presence?)]>()
     
-    init(sharedContext: SharedAccountContext, context: AccountContext, switchableAccounts: [AccountWithInfo], theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, peers: [(EngineRenderedPeer, PeerPresence?)], accountPeer: EnginePeer, controllerInteraction: ShareControllerInteraction, externalShare: Bool, switchToAnotherAccount: @escaping () -> Void, debugAction: @escaping () -> Void, extendedInitialReveal: Bool, segmentedValues: [ShareControllerSegmentedValue]?) {
+    init(sharedContext: SharedAccountContext, context: AccountContext, switchableAccounts: [AccountWithInfo], theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, peers: [(EngineRenderedPeer, EnginePeer.Presence?)], accountPeer: EnginePeer, controllerInteraction: ShareControllerInteraction, externalShare: Bool, switchToAnotherAccount: @escaping () -> Void, debugAction: @escaping () -> Void, extendedInitialReveal: Bool, segmentedValues: [ShareControllerSegmentedValue]?) {
         self.sharedContext = sharedContext
         self.context = context
         self.theme = theme
diff --git a/submodules/ShareController/Sources/ShareSearchContainerNode.swift b/submodules/ShareController/Sources/ShareSearchContainerNode.swift
index b057dbb658..78d8ef9720 100644
--- a/submodules/ShareController/Sources/ShareSearchContainerNode.swift
+++ b/submodules/ShareController/Sources/ShareSearchContainerNode.swift
@@ -36,7 +36,7 @@ private enum ShareSearchRecentEntryStableId: Hashable {
 
 private enum ShareSearchRecentEntry: Comparable, Identifiable {
     case topPeers(PresentationTheme, PresentationStrings)
-    case peer(index: Int, theme: PresentationTheme, peer: Peer, associatedPeer: Peer?, presence: PeerPresence?, PresentationStrings)
+    case peer(index: Int, theme: PresentationTheme, peer: Peer, associatedPeer: Peer?, presence: EnginePeer.Presence?, PresentationStrings)
     
     var stableId: ShareSearchRecentEntryStableId {
         switch self {
@@ -62,7 +62,7 @@ private enum ShareSearchRecentEntry: Comparable, Identifiable {
                     return false
                 }
             case let .peer(lhsIndex, lhsTheme, lhsPeer, lhsAssociatedPeer, lhsPresence, lhsStrings):
-                if case let .peer(rhsIndex, rhsTheme, rhsPeer, rhsAssociatedPeer, rhsPresence, rhsStrings) = rhs, lhsPeer.isEqual(rhsPeer) && arePeersEqual(lhsAssociatedPeer, rhsAssociatedPeer) && lhsIndex == rhsIndex && lhsStrings === rhsStrings && lhsTheme === rhsTheme && arePeerPresencesEqual(lhsPresence, rhsPresence) {
+                if case let .peer(rhsIndex, rhsTheme, rhsPeer, rhsAssociatedPeer, rhsPresence, rhsStrings) = rhs, lhsPeer.isEqual(rhsPeer) && arePeersEqual(lhsAssociatedPeer, rhsAssociatedPeer) && lhsIndex == rhsIndex && lhsStrings === rhsStrings && lhsTheme === rhsTheme && lhsPresence == rhsPresence {
                     return true
                 } else {
                     return false
@@ -102,7 +102,7 @@ private enum ShareSearchRecentEntry: Comparable, Identifiable {
 private struct ShareSearchPeerEntry: Comparable, Identifiable {
     let index: Int32
     let peer: EngineRenderedPeer?
-    let presence: PeerPresence?
+    let presence: EnginePeer.Presence?
     let theme: PresentationTheme
     let strings: PresentationStrings
     
diff --git a/submodules/ShareItems/Sources/ShareItems.swift b/submodules/ShareItems/Sources/ShareItems.swift
index 5ca8f2193a..33ddb6af04 100644
--- a/submodules/ShareItems/Sources/ShareItems.swift
+++ b/submodules/ShareItems/Sources/ShareItems.swift
@@ -464,15 +464,14 @@ public func sentShareItems(account: Account, to peerIds: [PeerId], items: [Prepa
     return enqueueMessagesToMultiplePeers(account: account, peerIds: peerIds, messages: messages)
     |> castError(Void.self)
     |> mapToSignal { messageIds -> Signal<Float, Void> in
-        let key: PostboxViewKey = .messages(Set(messageIds))
-        return account.postbox.combinedView(keys: [key])
+        return TelegramEngine(account: account).data.subscribe(EngineDataMap(
+            messageIds.map(TelegramEngine.EngineData.Item.Messages.Message.init)
+        ))
         |> castError(Void.self)
-        |> mapToSignal { view -> Signal<Float, Void> in
-            if let messagesView = view.views[key] as? MessagesView {
-                for (_, message) in messagesView.messages {
-                    if message.flags.contains(.Unsent) {
-                        return .complete()
-                    }
+        |> mapToSignal { messages -> Signal<Float, Void> in
+            for (_, message) in messages {
+                if let message = message, message.flags.contains(.Unsent) {
+                    return .complete()
                 }
             }
             return .single(1.0)
diff --git a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
index 50e39b8f95..369a610dff 100644
--- a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
+++ b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
@@ -1968,15 +1968,14 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                     |> distinctUntilChanged
                     |> runOn(.mainQueue())
                 } else {
-                    rawAdminIds = accountContext.account.postbox.combinedView(keys: [.cachedPeerData(peerId: peerId)])
-                    |> map { views -> Set<PeerId> in
-                        guard let view = views.views[.cachedPeerData(peerId: peerId)] as? CachedPeerDataView else {
+                    rawAdminIds = accountContext.engine.data.subscribe(
+                        TelegramEngine.EngineData.Item.Peer.LegacyGroupParticipants(id: peerId)
+                    )
+                    |> map { participants -> Set<PeerId> in
+                        guard case let .known(participants) = participants else {
                             return Set()
                         }
-                        guard let cachedData = view.cachedPeerData as? CachedGroupData, let participants = cachedData.participants else {
-                            return Set()
-                        }
-                        return Set(participants.participants.compactMap { item -> PeerId? in
+                        return Set(participants.compactMap { item -> PeerId? in
                             switch item {
                             case .creator, .admin:
                                 return item.peerId
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Data/MessagesData.swift b/submodules/TelegramCore/Sources/TelegramEngine/Data/MessagesData.swift
index b50b026b22..299988aac2 100644
--- a/submodules/TelegramCore/Sources/TelegramEngine/Data/MessagesData.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Data/MessagesData.swift
@@ -2,7 +2,7 @@ import SwiftSignalKit
 import Postbox
 
 public final class EngineTotalReadCounters {
-    private let state: ChatListTotalUnreadState
+    fileprivate let state: ChatListTotalUnreadState
 
     public init(state: ChatListTotalUnreadState) {
         self.state = state
@@ -13,8 +13,14 @@ public final class EngineTotalReadCounters {
     }
 }
 
+public extension EngineTotalReadCounters {
+    func _asCounters() -> ChatListTotalUnreadState {
+        return self.state
+    }
+}
+
 public struct EnginePeerReadCounters: Equatable {
-    private let state: CombinedPeerReadState?
+    fileprivate let state: CombinedPeerReadState?
 
     public init(state: CombinedPeerReadState?) {
         self.state = state
@@ -64,6 +70,10 @@ public extension EnginePeerReadCounters {
     init(incomingReadId: EngineMessage.Id.Id, outgoingReadId: EngineMessage.Id.Id, count: Int32, markedUnread: Bool) {
         self.init(state: CombinedPeerReadState(states: [(Namespaces.Message.Cloud, .idBased(maxIncomingReadId: incomingReadId, maxOutgoingReadId: outgoingReadId, maxKnownId: max(incomingReadId, outgoingReadId), count: count, markedUnread: markedUnread))]))
     }
+    
+    func _asReadCounters() -> CombinedPeerReadState? {
+        return self.state
+    }
 }
 
 public extension TelegramEngine.EngineData.Item {
@@ -260,5 +270,63 @@ public extension TelegramEngine.EngineData.Item {
                 return view.inclusion.groupId.flatMap(EngineChatList.Group.init)
             }
         }
+        
+        public struct MessageCount: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem {
+            public struct ItemKey: Hashable {
+                public var peerId: EnginePeer.Id
+                public var tag: MessageTags
+            }
+            
+            public typealias Result = Int?
+            
+            fileprivate var peerId: EnginePeer.Id
+            fileprivate var tag: MessageTags
+            public var mapKey: ItemKey {
+                return ItemKey(peerId: self.peerId, tag: self.tag)
+            }
+            
+            public init(peerId: EnginePeer.Id, tag: MessageTags) {
+                self.peerId = peerId
+                self.tag = tag
+            }
+
+            var key: PostboxViewKey {
+                return .historyTagSummaryView(tag: tag, peerId: peerId, namespace: Namespaces.Message.Cloud)
+            }
+
+            func extract(view: PostboxView) -> Result {
+                guard let view = view as? MessageHistoryTagSummaryView else {
+                    preconditionFailure()
+                }
+                return view.count.flatMap(Int.init)
+            }
+        }
+        
+        public struct TopMessage: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem {
+            public typealias Result = EngineMessage?
+            
+            fileprivate var id: EnginePeer.Id
+            public var mapKey: EnginePeer.Id {
+                return self.id
+            }
+            
+            public init(id: EnginePeer.Id) {
+                self.id = id
+            }
+
+            var key: PostboxViewKey {
+                return .topChatMessage(peerIds: [self.id])
+            }
+
+            func extract(view: PostboxView) -> Result {
+                guard let view = view as? TopChatMessageView else {
+                    preconditionFailure()
+                }
+                guard let message = view.messages[self.id] else {
+                    return nil
+                }
+                return EngineMessage(message)
+            }
+        }
     }
 }
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Data/PeersData.swift b/submodules/TelegramCore/Sources/TelegramEngine/Data/PeersData.swift
index ce1435d5e8..38c107076e 100644
--- a/submodules/TelegramCore/Sources/TelegramEngine/Data/PeersData.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Data/PeersData.swift
@@ -2,6 +2,7 @@ import SwiftSignalKit
 import Postbox
 
 public typealias EngineExportedPeerInvitation = ExportedInvitation
+public typealias EngineSecretChatKeyFingerprint = SecretChatKeyFingerprint
 
 public enum EnginePeerCachedInfoItem<T> {
     case known(T)
@@ -782,5 +783,34 @@ public extension TelegramEngine.EngineData.Item {
                 }
             }
         }
+        
+        public struct SecretChatKeyFingerprint: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem {
+            public typealias Result = EngineSecretChatKeyFingerprint?
+
+            fileprivate var id: EnginePeer.Id
+            public var mapKey: EnginePeer.Id {
+                return self.id
+            }
+
+            public init(id: EnginePeer.Id) {
+                self.id = id
+            }
+
+            var key: PostboxViewKey {
+                return .peerChatState(peerId: self.id)
+            }
+
+            func extract(view: PostboxView) -> Result {
+                guard let view = view as? PeerChatStateView else {
+                    preconditionFailure()
+                }
+                
+                if let peerChatState = view.chatState?.getLegacy() as? SecretChatState {
+                    return peerChatState.keyFingerprint
+                } else {
+                    return nil
+                }
+            }
+        }
     }
 }
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Data/TelegramEngineData.swift b/submodules/TelegramCore/Sources/TelegramEngine/Data/TelegramEngineData.swift
index 283c603cbf..bf03182201 100644
--- a/submodules/TelegramCore/Sources/TelegramEngine/Data/TelegramEngineData.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Data/TelegramEngineData.swift
@@ -95,6 +95,37 @@ public final class EngineDataList<Item: TelegramEngineDataItem & TelegramEngineM
     }
 }
 
+public final class EngineDataOptional<Item: TelegramEngineDataItem>: TelegramEngineDataItem, AnyPostboxViewDataItem {
+    public typealias Result = Item.Result?
+
+    private let item: Item?
+
+    public init(_ item: Item?) {
+        self.item = item
+    }
+
+    var keys: [PostboxViewKey] {
+        var keys = Set<PostboxViewKey>()
+        if let item = self.item {
+            for key in (item as! AnyPostboxViewDataItem).keys {
+                keys.insert(key)
+            }
+        }
+        return Array(keys)
+    }
+
+    func _extract(views: [PostboxViewKey: PostboxView]) -> Any {
+        var result: [Item.Result] = []
+
+        if let item = self.item {
+            let itemResult = (item as! AnyPostboxViewDataItem)._extract(views: views)
+            result.append(itemResult as! Item.Result)
+        }
+
+        return result
+    }
+}
+
 public extension TelegramEngine {
     final class EngineData {
         public struct Item {
diff --git a/submodules/TelegramUI/Sources/AccountContext.swift b/submodules/TelegramUI/Sources/AccountContext.swift
index 52350c0d03..b5462b4557 100644
--- a/submodules/TelegramUI/Sources/AccountContext.swift
+++ b/submodules/TelegramUI/Sources/AccountContext.swift
@@ -59,10 +59,9 @@ private final class DeviceSpecificContactImportContexts {
             if context.reference != reference {
                 context.reference = reference
                 
-                let key: PostboxViewKey = .basicPeer(peerId)
-                let signal = account.postbox.combinedView(keys: [key])
-                |> map { view -> String? in
-                    if let user = (view.views[key] as? BasicPeerView)?.peer as? TelegramUser {
+                let signal = TelegramEngine(account: account).data.subscribe(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId))
+                |> map { peer -> String? in
+                    if case let .user(user) = peer {
                         return user.phone
                     } else {
                         return nil
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index 920352583d..d1c0836a78 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -8567,42 +8567,34 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 })
 
                 if case let .peer(peerId) = self.chatLocation {
-                    let unreadCountsKey: PostboxViewKey = .unreadCounts(items: [.peer(peerId), .total(nil)])
-                    let notificationSettingsKey: PostboxViewKey = .peerNotificationSettings(peerIds: Set([peerId]))
-                    self.chatUnreadCountDisposable = (self.context.account.postbox.combinedView(keys: [unreadCountsKey, notificationSettingsKey])
-                    |> deliverOnMainQueue).start(next: { [weak self] views in
-                        if let strongSelf = self {
-                            var unreadCount: Int32 = 0
-                            var totalChatCount: Int32 = 0
-                            
-                            let inAppSettings = strongSelf.context.sharedContext.currentInAppNotificationSettings.with { $0 }
-                            if let view = views.views[unreadCountsKey] as? UnreadMessageCountsView {
-                                if let count = view.count(for: .peer(peerId)) {
-                                    unreadCount = count
-                                }
-                                if let (_, state) = view.total() {
-                                    let (count, _) = renderedTotalUnreadCount(inAppSettings: inAppSettings, totalUnreadState: state)
-                                    totalChatCount = count
-                                }
-                            }
-                            
-                            if let view = views.views[notificationSettingsKey] as? PeerNotificationSettingsView, let notificationSettings = view.notificationSettings[peerId] {
-                                var globalRemainingUnreadChatCount = totalChatCount
-                                if !notificationSettings.isRemovedFromTotalUnreadCount(default: false) && unreadCount > 0 {
-                                    if case .messages = inAppSettings.totalUnreadCountDisplayCategory {
-                                        globalRemainingUnreadChatCount -= unreadCount
-                                    } else {
-                                        globalRemainingUnreadChatCount -= 1
-                                    }
-                                }
-                                
-                                if globalRemainingUnreadChatCount > 0 {
-                                    strongSelf.navigationItem.badge = "\(globalRemainingUnreadChatCount)"
-                                } else {
-                                    strongSelf.navigationItem.badge = ""
-                                }
+                    self.chatUnreadCountDisposable = (self.context.engine.data.subscribe(
+                        TelegramEngine.EngineData.Item.Messages.PeerUnreadCount(id: peerId),
+                        TelegramEngine.EngineData.Item.Messages.TotalReadCounters(),
+                        TelegramEngine.EngineData.Item.Peer.NotificationSettings(id: peerId)
+                    )
+                    |> deliverOnMainQueue).start(next: { [weak self] peerUnreadCount, totalReadCounters, notificationSettings in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        let unreadCount: Int32 = Int32(peerUnreadCount)
+                        
+                        let inAppSettings = strongSelf.context.sharedContext.currentInAppNotificationSettings.with { $0 }
+                        let totalChatCount: Int32 = renderedTotalUnreadCount(inAppSettings: inAppSettings, totalUnreadState: totalReadCounters._asCounters()).0
+                        
+                        var globalRemainingUnreadChatCount = totalChatCount
+                        if !notificationSettings._asNotificationSettings().isRemovedFromTotalUnreadCount(default: false) && unreadCount > 0 {
+                            if case .messages = inAppSettings.totalUnreadCountDisplayCategory {
+                                globalRemainingUnreadChatCount -= unreadCount
+                            } else {
+                                globalRemainingUnreadChatCount -= 1
                             }
                         }
+                        
+                        if globalRemainingUnreadChatCount > 0 {
+                            strongSelf.navigationItem.badge = "\(globalRemainingUnreadChatCount)"
+                        } else {
+                            strongSelf.navigationItem.badge = ""
+                        }
                     })
                 
                     self.chatUnreadMentionCountDisposable = (self.context.account.viewTracker.unseenPersonalMessagesAndReactionCount(peerId: peerId) |> deliverOnMainQueue).start(next: { [weak self] mentionCount, reactionCount in
diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
index a622aaa073..180406aec3 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
@@ -931,20 +931,15 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         
         let customChannelDiscussionReadState: Signal<MessageId?, NoError>
         if case let .peer(peerId) = chatLocation, peerId.namespace == Namespaces.Peer.CloudChannel {
-            let cachedDataKey = PostboxViewKey.cachedPeerData(peerId: peerId)
-            let peerKey = PostboxViewKey.basicPeer(peerId)
-            customChannelDiscussionReadState = context.account.postbox.combinedView(keys: [cachedDataKey, peerKey])
-            |> mapToSignal { views -> Signal<PeerId?, NoError> in
-                guard let view = views.views[cachedDataKey] as? CachedPeerDataView else {
+            customChannelDiscussionReadState = context.engine.data.subscribe(
+                TelegramEngine.EngineData.Item.Peer.LinkedDiscussionPeerId(id: peerId),
+                TelegramEngine.EngineData.Item.Peer.Peer(id: peerId)
+            )
+            |> mapToSignal { linkedDiscussionPeerId, peer -> Signal<PeerId?, NoError> in
+                guard case let .channel(peer) = peer, case .broadcast = peer.info else {
                     return .single(nil)
                 }
-                guard let peer = (views.views[peerKey] as? BasicPeerView)?.peer as? TelegramChannel, case .broadcast = peer.info else {
-                    return .single(nil)
-                }
-                guard let cachedData = view.cachedPeerData as? CachedChannelData else {
-                    return .single(nil)
-                }
-                guard case let .known(value) = cachedData.linkedDiscussionPeerId else {
+                guard case let .known(value) = linkedDiscussionPeerId else {
                     return .single(nil)
                 }
                 return .single(value)
@@ -954,13 +949,10 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                 guard let discussionPeerId = discussionPeerId else {
                     return .single(nil)
                 }
-                let key = PostboxViewKey.combinedReadState(peerId: discussionPeerId)
-                return context.account.postbox.combinedView(keys: [key])
-                |> map { views -> MessageId? in
-                    guard let view = views.views[key] as? CombinedReadStateView else {
-                        return nil
-                    }
-                    guard let state = view.state else {
+                
+                return context.engine.data.subscribe(TelegramEngine.EngineData.Item.Messages.PeerReadCounters(id: discussionPeerId))
+                |> map { readCounters -> MessageId? in
+                    guard let state = readCounters._asReadCounters() else {
                         return nil
                     }
                     for (namespace, namespaceState) in state.states {
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputNode.swift b/submodules/TelegramUI/Sources/ChatMediaInputNode.swift
index 6851645a6b..3a4a10ea53 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputNode.swift
@@ -1071,16 +1071,10 @@ final class ChatMediaInputNode: ChatInputNode {
         })
         self.trendingInteraction = trendingInteraction
         
-        let preferencesViewKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.appConfiguration]))
-        let reactions: Signal<[String], NoError> = context.account.postbox.combinedView(keys: [preferencesViewKey])
-        |> map { views -> [String] in
+        let reactions: Signal<[String], NoError> = context.engine.data.subscribe(TelegramEngine.EngineData.Item.Configuration.App())
+        |> map { appConfiguration -> [String] in
             let defaultReactions: [String] = ["👍", "👎", "😍", "😂", "😯", "😕", "😢", "😡", "💪", "👏", "🙈", "😒"]
-            guard let view = views.views[preferencesViewKey] as? PreferencesView else {
-                return defaultReactions
-            }
-            guard let appConfiguration = view.values[PreferencesKeys.appConfiguration]?.get(AppConfiguration.self) else {
-                return defaultReactions
-            }
+            
             guard let data = appConfiguration.data, let emojis = data["gif_search_emojies"] as? [String] else {
                 return defaultReactions
             }
diff --git a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
index 313b8ce1bc..fb9e5e0534 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
@@ -141,10 +141,12 @@ final class PeerInfoListPaneNode: ASDisplayNode, PeerInfoPaneNode {
                 }
             })
         }
-
-        self.statusPromise.set(context.account.postbox.combinedView(keys: [PostboxViewKey.historyTagSummaryView(tag: tagMask, peerId: peerId, namespace: Namespaces.Message.Cloud)])
-        |> map { views -> PeerInfoStatusData? in
-            let count: Int32 = (views.views[PostboxViewKey.historyTagSummaryView(tag: tagMask, peerId: peerId, namespace: Namespaces.Message.Cloud)] as? MessageHistoryTagSummaryView)?.count ?? 0
+        
+        self.statusPromise.set(context.engine.data.subscribe(
+            TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: peerId, tag: tagMask)
+        )
+        |> map { count -> PeerInfoStatusData? in
+            let count: Int = count ?? 0
             if count == 0 {
                 return nil
             }
diff --git a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
index 3a8f17e9da..2878a8e50b 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
@@ -2015,34 +2015,14 @@ final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScro
             case .music:
                 summaries.append(.music)
             }
-            return context.account.postbox.combinedView(keys: summaries.map { tag in
-                return PostboxViewKey.historyTagSummaryView(tag: tag, peerId: peerId, namespace: Namespaces.Message.Cloud)
-            })
-            |> map { views -> (ContentType, [MessageTags: Int32]) in
-                switch contentType {
-                case .photoOrVideo:
-                    summaries.append(.photo)
-                    summaries.append(.video)
-                case .photo:
-                    summaries.append(.photo)
-                case .video:
-                    summaries.append(.video)
-                case .gifs:
-                    summaries.append(.gif)
-                case .files:
-                    summaries.append(.file)
-                case .voiceAndVideoMessages:
-                    summaries.append(.voiceOrInstantVideo)
-                case .music:
-                    summaries.append(.music)
-                }
+            
+            return context.engine.data.subscribe(EngineDataMap(
+                summaries.map { TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: peerId, tag: $0) }
+            ))
+            |> map { summaries -> (ContentType, [MessageTags: Int32]) in
                 var result: [MessageTags: Int32] = [:]
-                for tag in summaries {
-                    if let view = views.views[PostboxViewKey.historyTagSummaryView(tag: tag, peerId: peerId, namespace: Namespaces.Message.Cloud)] as? MessageHistoryTagSummaryView {
-                        result[tag] = view.count ?? 0
-                    } else {
-                        result[tag] = 0
-                    }
+                for (key, count) in summaries {
+                    result[key.tag] = count.flatMap(Int32.init) ?? 0
                 }
                 return (contentType, result)
             }
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
index e187554c76..d9ce03b4a3 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
@@ -565,25 +565,20 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
                 return disposable
             }
             |> distinctUntilChanged
-            var combinedKeys: [PostboxViewKey] = []
+            
+            var secretChatKeyFingerprint: Signal<EngineSecretChatKeyFingerprint?, NoError> = .single(nil)
             if let secretChatId = secretChatId {
-                combinedKeys.append(.peerChatState(peerId: secretChatId))
+                secretChatKeyFingerprint = context.engine.data.subscribe(TelegramEngine.EngineData.Item.Peer.SecretChatKeyFingerprint(id: secretChatId))
             }
+            
             return combineLatest(
                 context.account.viewTracker.peerView(peerId, updateData: true),
                 peerInfoAvailableMediaPanes(context: context, peerId: peerId),
                 context.engine.data.subscribe(TelegramEngine.EngineData.Item.NotificationSettings.Global()),
-                context.account.postbox.combinedView(keys: combinedKeys),
+                secretChatKeyFingerprint,
                 status
             )
-            |> map { peerView, availablePanes, globalNotificationSettings, combinedView, status -> PeerInfoScreenData in
-                var encryptionKeyFingerprint: SecretChatKeyFingerprint?
-                if let secretChatId = secretChatId, let peerChatStateView = combinedView.views[.peerChatState(peerId: secretChatId)] as? PeerChatStateView {
-                    if let peerChatState = peerChatStateView.chatState?.getLegacy() as? SecretChatState {
-                        encryptionKeyFingerprint = peerChatState.keyFingerprint
-                    }
-                }
-                
+            |> map { peerView, availablePanes, globalNotificationSettings, encryptionKeyFingerprint, status -> PeerInfoScreenData in
                 var availablePanes = availablePanes
                 if availablePanes != nil, groupsInCommon != nil, let cachedData = peerView.cachedData as? CachedUserData {
                     if cachedData.commonGroupCount != 0 {
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
index 5ccfad7f4e..6b97eda603 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
@@ -6766,24 +6766,20 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewDelegate
     }
 
     private func displayMediaGalleryContextMenu(source: ContextReferenceContentNode, gesture: ContextGesture?) {
-        let summaryTags: [MessageTags] = [.photo, .video]
         let peerId = self.peerId
-        let _ = (context.account.postbox.combinedView(keys: summaryTags.map { tag in
-            return PostboxViewKey.historyTagSummaryView(tag: tag, peerId: peerId, namespace: Namespaces.Message.Cloud)
-        })
-        |> take(1)
-        |> deliverOnMainQueue).start(next: { [weak self] views in
+        
+        let _ = (self.context.engine.data.get(EngineDataMap([
+            TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: peerId, tag: .photo),
+            TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: peerId, tag: .video)
+        ]))
+        |> deliverOnMainQueue).start(next: { [weak self] messageCounts in
             guard let strongSelf = self else {
                 return
             }
 
             var mediaCount: [MessageTags: Int32] = [:]
-            for tag in summaryTags {
-                if let view = views.views[PostboxViewKey.historyTagSummaryView(tag: tag, peerId: peerId, namespace: Namespaces.Message.Cloud)] as? MessageHistoryTagSummaryView {
-                    mediaCount[tag] = view.count ?? 0
-                } else {
-                    mediaCount[tag] = 0
-                }
+            for (key, count) in messageCounts {
+                mediaCount[key.tag] = count.flatMap(Int32.init) ?? 0
             }
 
             let photoCount: Int32 = mediaCount[.photo] ?? 0
diff --git a/submodules/TelegramUI/Sources/PeerInfoGifPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfoGifPaneNode.swift
index eea5dbe70d..e2d4f5c3f7 100644
--- a/submodules/TelegramUI/Sources/PeerInfoGifPaneNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfoGifPaneNode.swift
@@ -875,12 +875,11 @@ final class PeerInfoGifPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScrollViewDe
         self.animationTimer = animationTimer
         animationTimer.start()
 
-        self.statusPromise.set(context.account.postbox.combinedView(keys: [PostboxViewKey.historyTagSummaryView(tag: tagMaskForType(self.contentType), peerId: peerId, namespace: Namespaces.Message.Cloud)])
-        |> map { [weak self] views -> PeerInfoStatusData? in
-            guard let strongSelf = self else {
-                return nil
-            }
-            let count: Int32 = (views.views[PostboxViewKey.historyTagSummaryView(tag: tagMaskForType(strongSelf.contentType), peerId: peerId, namespace: Namespaces.Message.Cloud)] as? MessageHistoryTagSummaryView)?.count ?? 0
+        self.statusPromise.set(context.engine.data.subscribe(
+            TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: peerId, tag: tagMaskForType(self.contentType))
+        )
+        |> map { count -> PeerInfoStatusData? in
+            let count: Int = count ?? 0
             if count == 0 {
                 return nil
             }
diff --git a/submodules/TelegramUI/Sources/WidgetDataContext.swift b/submodules/TelegramUI/Sources/WidgetDataContext.swift
index 2877f3ae6a..40d9b5b36d 100644
--- a/submodules/TelegramUI/Sources/WidgetDataContext.swift
+++ b/submodules/TelegramUI/Sources/WidgetDataContext.swift
@@ -198,15 +198,16 @@ final class WidgetDataContext {
                 if peerIds.isEmpty {
                     continue
                 }
-                let topMessagesKey: PostboxViewKey = .topChatMessage(peerIds: Array(peerIds))
                 
-                accountSignals.append(account.postbox.combinedView(keys: [topMessagesKey])
-                |> map { combinedView -> [WidgetDataPeer] in
-                    guard let topMessages = combinedView.views[topMessagesKey] as? TopChatMessageView else {
-                        return []
-                    }
+                accountSignals.append(TelegramEngine(account: account).data.subscribe(EngineDataMap(
+                    peerIds.map(TelegramEngine.EngineData.Item.Messages.TopMessage.init)
+                ))
+                |> map { topMessages -> [WidgetDataPeer] in
                     var result: [WidgetDataPeer] = []
-                    for (peerId, message) in topMessages.messages {
+                    for (peerId, message) in topMessages {
+                        guard let message = message else {
+                            continue
+                        }
                         guard let peer = message.peers[message.id.peerId] else {
                             continue
                         }
@@ -227,7 +228,7 @@ final class WidgetDataContext {
                             name = peer.debugDisplayTitle
                         }
                         
-                        result.append(WidgetDataPeer(id: peerId.toInt64(), name: name, lastName: lastName, letters: [], avatarPath: nil, badge: nil, message: WidgetDataPeer.Message(accountPeerId: account.peerId, message: EngineMessage(message))))
+                        result.append(WidgetDataPeer(id: peerId.toInt64(), name: name, lastName: lastName, letters: [], avatarPath: nil, badge: nil, message: WidgetDataPeer.Message(accountPeerId: account.peerId, message: message)))
                     }
                     result.sort(by: { lhs, rhs in
                         return lhs.id < rhs.id