From ccc5f60c01213ecb16ded95df6180b6978763d1a Mon Sep 17 00:00:00 2001
From: Fooxboy <fooxboy@yandex.ru>
Date: Wed, 12 Jun 2024 14:13:59 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=20VkBlockHelper.cs"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 01fe732a3eb5ca3a30d5f7eaa652ab67d92758e1.
---
 MusicX.Core/Helpers/BlockExtensions.Fetch.cs  | 129 ---
 .../Helpers/BlockExtensions.Process.cs        |  59 --
 .../Helpers/Processors/BlocksProcessor.cs     |  29 -
 .../Helpers/Processors/PlaylistsProcessor.cs  |  37 -
 .../Processors/ReplacementsProcessor.cs       |  34 -
 .../Helpers/Processors/SectionProcessor.cs    | 194 -----
 MusicX.Core/Helpers/VkBlockHelper.cs          | 773 +++++++++++++++++-
 .../Models/Abstractions/IBlockEntity.cs       |   6 -
 .../Abstractions/IBlockEntityWithOwner.cs     |   6 -
 MusicX.Core/Models/Artist.cs                  |  49 +-
 MusicX.Core/Models/Audio.cs                   | 167 ++--
 .../Models/AudioFollowingsUpdateInfo.cs       |   9 +-
 MusicX.Core/Models/CatalogBanner.cs           |  60 +-
 MusicX.Core/Models/Curator.cs                 |  43 +-
 MusicX.Core/Models/General/ResponseVk.cs      |   6 +-
 MusicX.Core/Models/Group.cs                   |  74 +-
 MusicX.Core/Models/Link.cs                    |   3 +-
 MusicX.Core/Models/Longread.cs                |   3 +-
 MusicX.Core/Models/MusicOwner.cs              |   5 +-
 MusicX.Core/Models/Placeholder.cs             |  30 +-
 MusicX.Core/Models/Playlist.cs                |   3 +-
 MusicX.Core/Models/PodcastEpisode.cs          |   3 +-
 MusicX.Core/Models/PodcastSliderItem.cs       |  27 +-
 MusicX.Core/Models/Replacements.cs            |   2 +-
 MusicX.Core/Models/Suggestion.cs              |   3 +-
 MusicX.Core/Models/Text.cs                    |  22 +-
 MusicX.Core/Models/Video.cs                   |   3 +-
 MusicX.Core/Services/VkService.cs             |  20 +-
 28 files changed, 1029 insertions(+), 770 deletions(-)
 delete mode 100644 MusicX.Core/Helpers/BlockExtensions.Fetch.cs
 delete mode 100644 MusicX.Core/Helpers/BlockExtensions.Process.cs
 delete mode 100644 MusicX.Core/Helpers/Processors/BlocksProcessor.cs
 delete mode 100644 MusicX.Core/Helpers/Processors/PlaylistsProcessor.cs
 delete mode 100644 MusicX.Core/Helpers/Processors/ReplacementsProcessor.cs
 delete mode 100644 MusicX.Core/Helpers/Processors/SectionProcessor.cs
 delete mode 100644 MusicX.Core/Models/Abstractions/IBlockEntity.cs
 delete mode 100644 MusicX.Core/Models/Abstractions/IBlockEntityWithOwner.cs

diff --git a/MusicX.Core/Helpers/BlockExtensions.Fetch.cs b/MusicX.Core/Helpers/BlockExtensions.Fetch.cs
deleted file mode 100644
index 8054f519..00000000
--- a/MusicX.Core/Helpers/BlockExtensions.Fetch.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using MusicX.Core.Models;
-using MusicX.Core.Models.Abstractions;
-
-namespace MusicX.Core.Helpers;
-
-internal static partial class BlockExtensions
-{
-    private static IEnumerable<Suggestion> GetSuggestionsForBlock(this Block block, List<Suggestion> suggestions) =>
-        GetItemsForBlock(block.SuggestionsIds, suggestions);
-
-    private static IEnumerable<Placeholder> GetPlaceholdersForBlock(this Block block, List<Placeholder> placeholders) =>
-        GetItemsForBlock(block.PlaceholdersIds, placeholders);
-
-    private static IEnumerable<Artist> GetArtistsForBlock(this Block block, List<Artist> artists) =>
-        GetItemsForBlock(block.ArtistsIds, artists);
-
-    private static IEnumerable<Text> GetTextsForBlock(this Block block, List<Text> texts) =>
-        GetItemsForBlock(block.TextIds, texts);
-
-    private static IEnumerable<Group> GetGroupsForBlock(this Block block, List<Group> groups)
-    {
-        var groupIds = block.GroupIds.Concat(
-            block.GroupsItemsIds.Select(g => (long)g.Id));
-
-        return GetItemsForBlock(groupIds, groups);
-    }
-
-    private static IEnumerable<Curator> GetCuratorsForBlock(this Block block, List<Curator> curators) =>
-        GetItemsForBlock(block.CuratorsIds, curators);
-
-    private static IEnumerable<MusicOwner> GetMusicOwnersForBlock(this Block block, List<MusicOwner> musicOwners) =>
-        GetItemsForBlock(block.MusicOwnerIds, musicOwners);
-
-
-    private static IEnumerable<AudioFollowingsUpdateInfo> GetFollowingsUpdateInfosForBlock(
-        this Block block,
-        List<AudioFollowingsUpdateInfo> followingsUpdateInfos) =>
-        GetItemsForBlock(block.FollowingUpdateInfoIds, followingsUpdateInfos);
-
-    private static IEnumerable<CatalogBanner> GetCatalogBannersForBlock(
-        this Block block,
-        List<CatalogBanner> catalogBanners) =>
-        GetItemsForBlock(block.CatalogBannerIds, catalogBanners);
-
-    private static IEnumerable<Link> GetLinksForBlock(this Block block, List<Link> links) =>
-        GetItemsForBlock(block.LinksIds, links);
-
-    private static IEnumerable<Audio> GetAudiosForBlock(this Block block, List<Audio> audios) =>
-        GetItemsWithOwnerIdForBlock<long, long, Audio>(block.AudiosIds, audios);
-
-    private static IEnumerable<Playlist> GetPlaylistsForBlock(this Block block, List<Playlist> playlists) =>
-        GetItemsWithOwnerIdForBlock<long, long, Playlist>(block.PlaylistsIds, playlists);
-
-    private static IEnumerable<PodcastSliderItem> GetPodcastSliderItemsForBlock(
-        this Block block,
-        List<PodcastSliderItem> podcastSliderItems) =>
-        GetItemsForBlock(block.PodcastSliderItemsIds, podcastSliderItems);
-
-    private static IEnumerable<PodcastEpisode> GetPodcastEpisodesForBlock(
-        this Block block,
-        List<PodcastEpisode> podcastEpisodes) =>
-        GetItemsWithOwnerIdForBlock<int, int, PodcastEpisode>(block.PodcastEpisodesIds, podcastEpisodes);
-
-    private static IEnumerable<Longread> GetLongreadsForBlock(
-        this Block block,
-        List<Longread> longreads) =>
-        GetItemsWithOwnerIdForBlock<int, int, Longread>(block.LongreadsIds, longreads);
-
-    private static IEnumerable<Video> GetVideosForBlock(
-        this Block block,
-        List<Video> videos) =>
-        GetItemsWithOwnerIdForBlock<int, int, Video>(block.VideosIds, videos);
-
-    private static IEnumerable<Video> GetArtistVideosForBlock(
-        this Block block,
-        List<Video> artistVideos) =>
-        GetItemsWithOwnerIdForBlock<int, int, Video>(block.ArtistVideosIds, artistVideos);
-
-    private static IEnumerable<TItem> GetItemsForBlock<TId, TItem>(
-        IEnumerable<TId> blockItemIds,
-        List<TItem> responseItems)
-        where TItem : class, IBlockEntity<TId>
-    {
-        var idComparer = EqualityComparer<TId>.Default;
-
-        foreach (var itemId in blockItemIds)
-        {
-            var item = responseItems.Find(x => idComparer.Equals(x.Id, itemId));
-
-            if (item != null)
-            {
-                yield return item;
-            }
-        }
-    }
-
-    private static IEnumerable<TItem> GetItemsWithOwnerIdForBlock<TId, TOwnerId, TItem>(
-        IEnumerable<string> blockItemIds,
-        List<TItem> responseItems)
-        where TItem : class, IBlockEntityWithOwner<TId, TOwnerId>
-        where TId : IParsable<TId>
-        where TOwnerId : IParsable<TOwnerId>
-    {
-        var idComparer = EqualityComparer<TId>.Default;
-        var ownerIdComparer = EqualityComparer<TOwnerId>.Default;
-
-        foreach (var itemId in blockItemIds)
-        {
-            var idsArray = itemId.Split('_');
-            var audioId = TId.Parse(idsArray[1], default);
-            var ownerId = TOwnerId.Parse(idsArray[0], default);
-
-            var item = responseItems.Find(x =>
-                idComparer.Equals(x.Id, audioId) &&
-                ownerIdComparer.Equals(x.OwnerId, ownerId));
-
-            if (item != null)
-            {
-                // TODO: заменить этот костыль
-                if (item is Audio audio)
-                {
-                    audio.ParentBlockId = itemId;
-                }
-
-                yield return item;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/MusicX.Core/Helpers/BlockExtensions.Process.cs b/MusicX.Core/Helpers/BlockExtensions.Process.cs
deleted file mode 100644
index 26074a16..00000000
--- a/MusicX.Core/Helpers/BlockExtensions.Process.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using MusicX.Core.Models;
-
-namespace MusicX.Core.Helpers;
-
-internal static partial class BlockExtensions
-{
-    public static void ProcessAudios(this Block block, List<Audio> audios) =>
-        block.Audios.AddRange(block.GetAudiosForBlock(audios));
-
-    public static void ProcessPlaylists(this Block block, List<Playlist> playlists) =>
-        block.Playlists.AddRange(block.GetPlaylistsForBlock(playlists));
-
-    public static void ProcessCatalogBanners(this Block block, List<CatalogBanner> catalogBanners) =>
-        block.Banners.AddRange(block.GetCatalogBannersForBlock(catalogBanners));
-
-    public static void ProcessLinks(this Block block, List<Link> links) =>
-        block.Links.AddRange(block.GetLinksForBlock(links));
-
-    public static void ProcessSuggestions(this Block block, List<Suggestion> suggestions) =>
-        block.Suggestions.AddRange(block.GetSuggestionsForBlock(suggestions));
-
-    public static void ProcessPlaceholders(this Block block, List<Placeholder> placeholders) =>
-        block.Placeholders.AddRange(block.GetPlaceholdersForBlock(placeholders));
-
-    public static void ProcessArtists(this Block block, List<Artist> artists) =>
-        block.Artists.AddRange(block.GetArtistsForBlock(artists));
-
-    public static void ProcessTexts(this Block block, List<Text> texts) =>
-        block.Texts.AddRange(block.GetTextsForBlock(texts));
-
-    public static void ProcessGroups(this Block block, List<Group> groups) =>
-        block.Groups.AddRange(block.GetGroupsForBlock(groups));
-
-    public static void ProcessCurators(this Block block, List<Curator> curators) =>
-        block.Curators.AddRange(block.GetCuratorsForBlock(curators));
-
-    public static void ProcessMusicOwners(this Block block, List<MusicOwner> musicOwners) =>
-        block.MusicOwners.AddRange(block.GetMusicOwnersForBlock(musicOwners));
-
-    public static void ProcessPodcastSliderItems(this Block block, List<PodcastSliderItem> podcastSliderItems) =>
-        block.PodcastSliderItems.AddRange(block.GetPodcastSliderItemsForBlock(podcastSliderItems));
-
-    public static void ProcessPodcastEpisodes(this Block block, List<PodcastEpisode> podcastEpisodes) =>
-        block.PodcastEpisodes.AddRange(block.GetPodcastEpisodesForBlock(podcastEpisodes));
-
-    public static void ProcessLongreads(this Block block, List<Longread> longreads) =>
-        block.Longreads.AddRange(block.GetLongreadsForBlock(longreads));
-
-    public static void ProcessVideos(this Block block, List<Video> videos) =>
-        block.Videos.AddRange(block.GetVideosForBlock(videos));
-
-    public static void ProcessArtistVideos(this Block block, List<Video> artistVideos) =>
-        block.ArtistVideos.AddRange(block.GetArtistVideosForBlock(artistVideos));
-
-    public static void ProcessFollowingsUpdateInfos(
-        this Block block,
-        List<AudioFollowingsUpdateInfo> followingsUpdateInfos) =>
-        block.FollowingsUpdateInfos.AddRange(block.GetFollowingsUpdateInfosForBlock(followingsUpdateInfos));
-}
\ No newline at end of file
diff --git a/MusicX.Core/Helpers/Processors/BlocksProcessor.cs b/MusicX.Core/Helpers/Processors/BlocksProcessor.cs
deleted file mode 100644
index 61d1c1ac..00000000
--- a/MusicX.Core/Helpers/Processors/BlocksProcessor.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using MusicX.Core.Models.General;
-
-namespace MusicX.Core.Helpers.Processors;
-
-internal static class BlocksProcessor
-{
-    public static void Process(ResponseData response)
-    {
-        if (response.Block == null)
-        {
-            return;
-        }
-
-        var block = response.Block;
-
-        block.ProcessAudios(response.Audios);
-        block.ProcessPlaylists(response.Playlists);
-        block.ProcessCatalogBanners(response.CatalogBanners);
-        block.ProcessLinks(response.Links);
-        block.ProcessSuggestions(response.Suggestions);
-        block.ProcessPlaceholders(response.Placeholders);
-        block.ProcessArtists(response.Artists);
-        block.ProcessTexts(response.Texts);
-        block.ProcessGroups(response.Groups);
-        block.ProcessCurators(response.Curators);
-        block.ProcessMusicOwners(response.MusicOwners);
-        block.ProcessFollowingsUpdateInfos(response.FollowingsUpdateInfos);
-    }
-}
\ No newline at end of file
diff --git a/MusicX.Core/Helpers/Processors/PlaylistsProcessor.cs b/MusicX.Core/Helpers/Processors/PlaylistsProcessor.cs
deleted file mode 100644
index 5c044aec..00000000
--- a/MusicX.Core/Helpers/Processors/PlaylistsProcessor.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using MusicX.Core.Models.General;
-
-namespace MusicX.Core.Helpers.Processors;
-
-internal static class PlaylistsProcessor
-{
-    internal static void Process(ResponseData response)
-    {
-        foreach (var playlist in response.Playlists)
-        {
-            var ownerId = playlist.Original?.OwnerId ?? playlist.OwnerId;
-            playlist.OwnerName = GetOwnerName(ownerId, response);
-        }
-    }
-
-    private static string GetOwnerName(long ownerId, ResponseData response)
-    {
-        if (ownerId < 0)
-        {
-            var id = ownerId * -1;
-            var value = response.Groups.Find(g => g.Id == id);
-
-            return value?.Name ?? throw new ArgumentException("Group not found");
-        }
-        else
-        {
-            var value = response.Profiles.Find(p => p.Id == ownerId);
-
-            if (value is null)
-            {
-                throw new ArgumentException("Profile not found");
-            }
-
-            return value.FirstName + " " + value.LastName;
-        }
-    }
-}
\ No newline at end of file
diff --git a/MusicX.Core/Helpers/Processors/ReplacementsProcessor.cs b/MusicX.Core/Helpers/Processors/ReplacementsProcessor.cs
deleted file mode 100644
index c32e7666..00000000
--- a/MusicX.Core/Helpers/Processors/ReplacementsProcessor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using MusicX.Core.Models.General;
-
-namespace MusicX.Core.Helpers.Processors;
-
-internal static class ReplacementsProcessor
-{
-    internal static void Process(ResponseData response)
-    {
-        if (response.Replacements == null)
-        {
-            return;
-        }
-
-        var blockReplacements = response
-            .Replacements
-            .ReplacementsModels
-            .SelectMany(replaceModel => replaceModel.ToBlocks);
-
-        foreach (var block in blockReplacements)
-        {
-            block.ProcessAudios(response.Audios);
-            block.ProcessPlaylists(response.Playlists);
-            block.ProcessCatalogBanners(response.CatalogBanners);
-            block.ProcessLinks(response.Links);
-            block.ProcessSuggestions(response.Suggestions);
-            block.ProcessArtists(response.Artists);
-            block.ProcessTexts(response.Texts);
-            block.ProcessGroups(response.Groups);
-            block.ProcessCurators(response.Curators);
-            block.ProcessMusicOwners(response.MusicOwners);
-            block.ProcessFollowingsUpdateInfos(response.FollowingsUpdateInfos);
-        }
-    }
-}
\ No newline at end of file
diff --git a/MusicX.Core/Helpers/Processors/SectionProcessor.cs b/MusicX.Core/Helpers/Processors/SectionProcessor.cs
deleted file mode 100644
index fdd51209..00000000
--- a/MusicX.Core/Helpers/Processors/SectionProcessor.cs
+++ /dev/null
@@ -1,194 +0,0 @@
-using MusicX.Core.Models;
-using MusicX.Core.Models.General;
-
-namespace MusicX.Core.Helpers.Processors;
-
-internal static class SectionProcessor
-{
-    public static void Process(ResponseData response)
-    {
-        if (response.Section == null)
-        {
-            return;
-        }
-
-        foreach (var block in response.Section.Blocks)
-        {
-            block.ProcessAudios(response.Audios);
-            block.ProcessCatalogBanners(response.CatalogBanners);
-            block.ProcessLinks(response.Links);
-            block.ProcessPlaceholders(response.Placeholders);
-            block.ProcessSuggestions(response.Suggestions);
-            block.ProcessArtists(response.Artists);
-            block.ProcessTexts(response.Texts);
-            block.ProcessGroups(response.Groups);
-            block.ProcessPodcastSliderItems(response.PodcastSliderItems);
-            block.ProcessPodcastEpisodes(response.PodcastEpisodes);
-            block.ProcessLongreads(response.Longreads);
-            block.ProcessVideos(response.Videos);
-            block.ProcessArtistVideos(response.ArtistVideos);
-            block.ProcessMusicOwners(response.MusicOwners);
-            block.ProcessFollowingsUpdateInfos(response.FollowingsUpdateInfos);
-
-            ProcessSectionPlaylists(block, response);
-        }
-
-        ProcessSnippets(response);
-        RemoveGarbageBlocks(response);
-        ProcessHorizontalButtons(response);
-    }
-
-    private static void ProcessSnippets(ResponseData response)
-    {
-        var snippetsBannerIndex = response
-            .Section!
-            .Blocks
-            .FindIndex(b => b is { Layout.Name: "snippets_banner" });
-
-        if (snippetsBannerIndex >= 0)
-        {
-            response.Section.Blocks.RemoveAt(snippetsBannerIndex);
-            response.Section.Blocks.RemoveAt(snippetsBannerIndex); // excess separator
-        }
-    }
-
-    private static void RemoveGarbageBlocks(ResponseData response) =>
-        response.Section!.Blocks.RemoveAll(IsGarbageBlockPredicate);
-
-    private static bool IsGarbageBlockPredicate(Block block)
-    {
-        return IsRadiostationsBlock(block) ||
-               HasOnlyGarbageBanners(block) ||
-               HasOnlyGarbageLinks(block);
-    }
-
-    private static bool IsRadiostationsBlock(Block block)
-    {
-        return block.DataType == "radiostations" ||
-               block.Layout.Title == "Радиостанции" ||
-               block.Layout.Title == "Эфиры";
-    }
-
-    private static bool HasOnlyGarbageBanners(Block block)
-    {
-        return block.Banners.Count > 0 &&
-               block.Banners.RemoveAll(IsGarbageBanner) > 0 &&
-               block.Banners.Count == 0;
-    }
-
-    private static bool IsGarbageBanner(CatalogBanner banner)
-    {
-        var url = banner.ClickAction?.Action.Url;
-
-        if (url is null)
-        {
-            return false;
-        }
-
-        return url.Contains("subscription") ||
-               url.Contains("combo") ||
-               url.Contains("https://vk.com/app") ||
-               url.Contains("https://vk.com/vk_music");
-    }
-
-    private static bool HasOnlyGarbageLinks(Block block)
-    {
-        return block.Links.Count > 0 &&
-               block.Links.RemoveAll(IsGarbageLink) > 0 &&
-               block.Links.Count == 0;
-    }
-
-    private static bool IsGarbageLink(Link link)
-    {
-        return link.Url.Contains("audio_offline") ||
-               link.Url.Contains("radiostations") ||
-               link.Url.Contains("music_transfer") ||
-               link.Url.Contains("subscription");
-    }
-
-    private static void ProcessHorizontalButtons(ResponseData response)
-    {
-        var blocks = response.Section?.Blocks;
-        if (blocks == null)
-        {
-            return;
-        }
-
-        for (var i = blocks.Count - 1; i >= 0; i--)
-        {
-            var block = blocks[i];
-            if (IsHorizontalButtonsBlock(block))
-            {
-                var refBlockIndex = FindRefBlockIndex(blocks, block);
-                if (refBlockIndex >= 0 && IsOpenSectionAction(block))
-                {
-                    MergeActions(blocks, refBlockIndex, block);
-                    blocks.RemoveAt(i);
-                }
-            }
-        }
-    }
-
-    private static bool IsHorizontalButtonsBlock(Block block)
-    {
-        return block.DataType == "action" && block.Layout?.Name == "horizontal_buttons";
-    }
-
-    private static int FindRefBlockIndex(List<Block> blocks, Block block)
-    {
-        return blocks.FindIndex(b =>
-            b.DataType == block.Actions[0].RefDataType &&
-            b.Layout?.Name == block.Actions[0].RefLayoutName) - 1;
-    }
-
-    private static bool IsOpenSectionAction(Block block)
-    {
-        return block.Actions[0].Action.Type == "open_section";
-    }
-
-    private static void MergeActions(List<Block> blocks, int refBlockIndex, Block block)
-    {
-        blocks[refBlockIndex].Actions.AddRange(block.Actions);
-    }
-
-    private static void ProcessSectionPlaylists(Block block, ResponseData response)
-    {
-        if (block.DataType == "music_recommended_playlists")
-        {
-            ProcessRecommendedPlaylists(block, response);
-        }
-        else
-        {
-            block.ProcessPlaylists(response.Playlists);
-        }
-    }
-
-    //TODO: можно отрефакторить, но я уже устал
-    // ReSharper disable once CognitiveComplexity
-    private static void ProcessRecommendedPlaylists(Block block, ResponseData response)
-    {
-        foreach (var playlistId in block.PlaylistsIds)
-        {
-            var recommendedPlaylist = response.RecommendedPlaylists.Find(b => b.OwnerId + "_" + b.Id == playlistId);
-            if (recommendedPlaylist == null) continue;
-
-            var responsePlaylist = response.Playlists.Find(b => b.OwnerId + "_" + b.Id == playlistId);
-            if (responsePlaylist == null) continue;
-
-            recommendedPlaylist.Playlist = responsePlaylist;
-
-            block.RecommendedPlaylists.Add(recommendedPlaylist);
-        }
-
-        foreach (var recommendedPlaylist in block.RecommendedPlaylists)
-        {
-            foreach (var audioId in recommendedPlaylist.AudiosIds)
-            {
-                var audio = response.Audios.Find(b => b.OwnerId + "_" + b.Id == audioId);
-                if (audio == null) continue;
-
-                recommendedPlaylist.Audios.Add(audio);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/MusicX.Core/Helpers/VkBlockHelper.cs b/MusicX.Core/Helpers/VkBlockHelper.cs
index 66b9734b..60d7e07d 100644
--- a/MusicX.Core/Helpers/VkBlockHelper.cs
+++ b/MusicX.Core/Helpers/VkBlockHelper.cs
@@ -1,22 +1,765 @@
-using MusicX.Core.Models.General;
-using MusicX.Core.Helpers.Processors;
+using MusicX.Core.Models;
+using MusicX.Core.Models.General;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
 
-namespace MusicX.Core.Helpers;
-
-public static class VkBlockHelper
+namespace MusicX.Core.Helpers
 {
-    public static ResponseData Process(this ResponseData? response)
+    public static class VkBlockHelper
     {
-        if (response?.Playlists == null)
+
+        public static ResponseData Proccess(this ResponseData response)
         {
-            return null!;
-        }
 
-        PlaylistsProcessor.Process(response);
-        ReplacementsProcessor.Process(response);
-        BlocksProcessor.Process(response);
-        SectionProcessor.Process(response);
+            if(response.Playlists != null)
+            {
+                foreach(var playlist in response.Playlists)
+                {
+                    if (playlist.Original != null)
+                    {
+                        if (playlist.Original?.OwnerId < 0)
+                        {
+                            var id = (playlist.Original.OwnerId * -1);
+                            if(response.Groups != null)
+                            {
+                                var value = response.Groups.FirstOrDefault(g => g.Id == id);
+                                playlist.OwnerName = value?.Name;
+
+                            }
+
+                        }
+                        else
+                        {
+                            var value = response.Profiles.FirstOrDefault(p => p.Id == playlist.Original?.OwnerId);
+
+                            playlist.OwnerName = value?.FirstName + " " + value?.LastName;
+                        }
+                    }
+                    else
+                    {
+                        if (playlist.OwnerId < 0)
+                        {
+                            var id = (playlist.OwnerId * -1);
+                            if(response.Groups != null)
+                            {
+                                var value = response.Groups.FirstOrDefault(g => g.Id == id);
+
+                                playlist.OwnerName = value?.Name;
+                            }
+                        }
+                        else
+                        {
+                            var value = response.Profiles.FirstOrDefault(p => p.Id == playlist?.OwnerId);
+
+                            playlist.OwnerName = value?.FirstName + " " + value?.LastName;
+                        }
+                    }
+                }
+            }
+
+            if(response.Replacements != null)
+            {
+                foreach(var replaceModel in response.Replacements.ReplacementsModels)
+                {
+                    foreach(var block in replaceModel.ToBlocks)
+                    {
+                        if (block.AudiosIds != null || block.AudiosIds.Count > 0)
+                        {
+                            foreach (var audioStringId in block.AudiosIds)
+                            {
+                                var audioArray = audioStringId.Split('_');
+
+                                var audioId = long.Parse(audioArray[1]);
+                                var ownerId = long.Parse(audioArray[0]);
+
+                                var audio = response.Audios.FirstOrDefault(a => a.Id == audioId && a.OwnerId == ownerId);
+
+                                if (audio == null) continue;
+
+                                audio.ParentBlockId = block.Id;
+                                block.Audios.Add(audio);
+
+                            }
+                        }
+
+                        if (block.PlaylistsIds != null || block.PlaylistsIds.Count > 0)
+                        {
+                            foreach (var playlistStringId in block.PlaylistsIds)
+                            {
+                                var playlistArray = playlistStringId.Split('_');
+
+                                var playlistId = long.Parse(playlistArray[1]);
+                                var ownerId = long.Parse(playlistArray[0]);
+
+                                var playlist = response.Playlists.FirstOrDefault(p => p.Id == playlistId && p.OwnerId == ownerId);
+
+                                if (playlist == null) continue;
+
+                                block.Playlists.Add(playlist);
+
+                            }
+                        }
+
+                        if (block.CatalogBannerIds != null || block.CatalogBannerIds.Count > 0)
+                        {
+                            foreach (var bannerId in block.CatalogBannerIds)
+                            {
+
+                                var banner = response.CatalogBanners.FirstOrDefault(b => b.Id == bannerId);
+
+                                if (banner == null) continue;
+
+                                block.Banners.Add(banner);
+
+                            }
+                        }
+
+                        if (block.LinksIds != null || block.LinksIds.Count > 0)
+                        {
+                            foreach (var linkId in block.LinksIds)
+                            {
+
+                                var link = response.Links.FirstOrDefault(b => b.Id == linkId);
+
+                                if (link == null) continue;
+
+                                block.Links.Add(link);
+
+                            }
+                        }
+
+                        if (block.SuggestionsIds != null || block.SuggestionsIds.Count > 0)
+                        {
+                            foreach (var suggestionId in block.SuggestionsIds)
+                            {
+                                var suggestion = response.Suggestions.FirstOrDefault(b => b.Id == suggestionId);
+
+                                if (suggestion == null) continue;
+
+                                block.Suggestions.Add(suggestion);
+
+                            }
+                        }
+
+                        if (block.ArtistsIds != null || block.ArtistsIds.Count > 0)
+                        {
+                            foreach (var artistId in block.ArtistsIds)
+                            {
+                                var artist = response.Artists.FirstOrDefault(b => b.Id == artistId);
+
+                                if (artist == null) continue;
+
+                                block.Artists.Add(artist);
+
+                            }
+                        }
+
+                        if (block.TextIds != null || block.TextIds.Count > 0)
+                        {
+                            foreach (var textId in block.TextIds)
+                            {
+                                var text = response.Texts.FirstOrDefault(b => b.Id == textId);
+
+                                if (text == null) continue;
+
+                                block.Texts.Add(text);
+
+                            }
+                        }
+
+                        if (block.GroupIds != null || block.GroupIds.Count > 0)
+                        {
+                            foreach (var groupId in block.GroupIds)
+                            {
+                                var group = response.Groups.FirstOrDefault(b => b.Id == groupId);
+
+                                if (group == null) continue;
+
+                                block.Groups.Add(group);
+
+                            }
+                        }
+
+                        if (block.GroupsItemsIds != null || block.GroupsItemsIds.Count > 0)
+                        {
+                            foreach (var groupId in block.GroupsItemsIds)
+                            {
+                                var group = response.Groups.FirstOrDefault(b => b.Id == groupId.Id);
+
+                                if (group == null) continue;
+
+                                block.Groups.Add(group);
+
+                            }
+                        }
+
+                        if (block.CuratorsIds != null || block.CuratorsIds.Count > 0)
+                        {
+                            foreach (var curatorId in block.CuratorsIds)
+                            {
+                                var curator = response.Curators.FirstOrDefault(b => b.Id == curatorId);
+
+                                if (curator == null) continue;
+
+                                block.Curators.Add(curator);
+
+                            }
+                        }
+
+                        if (block.MusicOwnerIds.Count > 0)
+                        {
+                            foreach (var ownerId in block.MusicOwnerIds)
+                            {
+                                var owner = response.MusicOwners.FirstOrDefault(b => b.Id == ownerId);
+                        
+                                if (owner == null) continue;
+                        
+                                block.MusicOwners.Add(owner);
+                            }
+                        }
+
+                        if (block.FollowingUpdateInfoIds.Count > 0)
+                        {
+                            foreach (var updateInfoId in block.FollowingUpdateInfoIds)
+                            {
+                                var updateInfo = response.FollowingsUpdateInfos.FirstOrDefault(b => b.Id == updateInfoId);
+                        
+                                if (updateInfo == null) continue;
+
+                                block.FollowingsUpdateInfos.Add(updateInfo);
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (response.Block != null)
+            {
+                
+                if (response.Block.AudiosIds != null || response.Block.AudiosIds.Count > 0)
+                {
+                    foreach (var audioStringId in response.Block.AudiosIds)
+                    {
+                        var audioArray = audioStringId.Split('_');
+
+                        var audioId = long.Parse(audioArray[1]);
+                        var ownerId = long.Parse(audioArray[0]);
+
+                        var audio = response.Audios.FirstOrDefault(a => a.Id == audioId && a.OwnerId == ownerId);
+
+                        if (audio == null) continue;
+
+                        audio.ParentBlockId = response.Block.Id;
+
+                        response.Block.Audios.Add(audio);
+
+                    }
+                }
+
+                if (response.Block.PlaylistsIds != null || response.Block.PlaylistsIds.Count > 0)
+                {
+                    foreach (var playlistStringId in response.Block.PlaylistsIds)
+                    {
+                        var playlistArray = playlistStringId.Split('_');
+
+                        var playlistId = long.Parse(playlistArray[1]);
+                        var ownerId = long.Parse(playlistArray[0]);
+
+                        var playlist = response.Playlists.FirstOrDefault(p => p.Id == playlistId && p.OwnerId == ownerId);
+
+                        if (playlist == null) continue;
+
+                        response.Block.Playlists.Add(playlist);
+
+                    }
+                }
+
+                if (response.Block.CatalogBannerIds != null || response.Block.CatalogBannerIds.Count > 0)
+                {
+                    foreach (var bannerId in response.Block.CatalogBannerIds)
+                    {
+
+
+                        var banner = response.CatalogBanners.FirstOrDefault(b => b.Id == bannerId);
+
+                        if (banner == null) continue;
+
+                        response.Block.Banners.Add(banner);
+
+                    }
+                }
+
+                if (response.Block.LinksIds != null || response.Block.LinksIds.Count > 0)
+                {
+                    foreach (var linkId in response.Block.LinksIds)
+                    {
+                        var link = response.Links.FirstOrDefault(b => b.Id == linkId);
+
+                        if (link == null) continue;
+
+                        response.Block.Links.Add(link);
+
+                    }
+                }
+
+                if(response.Block.SuggestionsIds != null || response.Block.SuggestionsIds.Count > 0)
+                {
+                    foreach (var suggestionId in response.Block.SuggestionsIds)
+                    {
+                        var suggestion = response.Suggestions.FirstOrDefault(b => b.Id == suggestionId);
+
+                        if (suggestion == null) continue;
+
+                        response.Block.Suggestions.Add(suggestion);
+
+                    }
+                }
+
+                if (response.Block.PlaceholdersIds != null || response.Block.PlaceholdersIds.Count > 0)
+                {
+                    foreach (var placeholderId in response.Block.PlaceholdersIds)
+                    {
+                        var placeholder = response.Placeholders.FirstOrDefault(b => b.Id == placeholderId);
+
+                        if (placeholder == null) continue;
+
+                        response.Block.Placeholders.Add(placeholder);
+
+                    }
+                }
+
+                if (response.Block.ArtistsIds != null || response.Block.ArtistsIds.Count > 0)
+                {
+                    foreach (var artistId in response.Block.ArtistsIds)
+                    {
+                        var artist = response.Artists.FirstOrDefault(b => b.Id == artistId);
+
+                        if (artist == null) continue;
+
+                        response.Block.Artists.Add(artist);
+
+                    }
+                }
+
+                if (response.Block.TextIds != null || response.Block.TextIds.Count > 0)
+                {
+                    foreach (var textId in response.Block.TextIds)
+                    {
+                        var text = response.Texts.FirstOrDefault(b => b.Id == textId);
+
+                        if (text == null) continue;
+
+                        response.Block.Texts.Add(text);
+
+                    }
+                }
+
+                if (response.Block.GroupIds != null || response.Block.GroupIds.Count > 0)
+                {
+                    foreach (var groupId in response.Block.GroupIds)
+                    {
+                        var group = response.Groups.FirstOrDefault(b => b.Id == groupId);
+
+                        if (group == null) continue;
+
+                        response.Block.Groups.Add(group);
+
+                    }
+                }
 
-        return response;
+                if (response.Block.GroupsItemsIds != null || response.Block.GroupsItemsIds.Count > 0)
+                {
+                    foreach (var groupId in response.Block.GroupsItemsIds)
+                    {
+                        var group = response.Groups.FirstOrDefault(b => b.Id == groupId.Id);
+
+                        if (group == null) continue;
+
+                        response.Block.Groups.Add(group);
+
+                    }
+                }
+
+                if (response.Block.CuratorsIds != null || response.Block.CuratorsIds.Count > 0)
+                {
+                    foreach (var curatorId in response.Block.CuratorsIds)
+                    {
+                        var curator = response.Curators.FirstOrDefault(b => b.Id == curatorId);
+
+                        if (curator == null) continue;
+
+                        response.Block.Curators.Add(curator);
+
+                    }
+                }
+
+                if (response.Block.MusicOwnerIds.Count > 0)
+                {
+                    foreach (var ownerId in response.Block.MusicOwnerIds)
+                    {
+                        var owner = response.MusicOwners.FirstOrDefault(b => b.Id == ownerId);
+                        
+                        if (owner == null) continue;
+                        
+                        response.Block.MusicOwners.Add(owner);
+                    }
+                }
+                
+                if (response.Block.FollowingUpdateInfoIds.Count > 0)
+                {
+                    foreach (var updateInfoId in response.Block.FollowingUpdateInfoIds)
+                    {
+                        var updateInfo = response.FollowingsUpdateInfos.FirstOrDefault(b => b.Id == updateInfoId);
+                        
+                        if (updateInfo == null) continue;
+
+                        response.Block.FollowingsUpdateInfos.Add(updateInfo);
+                    }
+                }
+
+            }
+
+            if (response.Section == null) return response;
+
+            foreach (var block in response.Section.Blocks)
+            {
+                if(block.AudiosIds != null || block.AudiosIds.Count > 0)
+                {
+                    foreach(var audioStringId in block.AudiosIds)
+                    {
+                        var audioArray = audioStringId.Split('_');
+
+                        var audioId = long.Parse(audioArray[1]);
+                        var ownerId = long.Parse(audioArray[0]);
+
+                        var audio = response.Audios.FirstOrDefault(a=> a.Id == audioId && a.OwnerId == ownerId);
+
+                        if (audio == null) continue;
+
+                        audio.ParentBlockId = block.Id;
+
+                        block.Audios.Add(audio);
+                        
+                    }
+                }
+
+                if (block.PlaylistsIds != null || block.PlaylistsIds.Count > 0)
+                {
+
+                    if(block.DataType == "music_recommended_playlists")
+                    {
+                        foreach (var lid in block.PlaylistsIds)
+                        {
+                            var p = response.RecommendedPlaylists.FirstOrDefault(b => b.OwnerId + "_" + b.Id == lid);
+
+                            if (p == null) continue;
+
+                            var pp = response.Playlists.FirstOrDefault(b => b.OwnerId + "_" + b.Id == lid);
+
+                            p.Playlist = pp;
+                            block.RecommendedPlaylists.Add(p);
+
+                        }
+
+                        foreach (var r in block.RecommendedPlaylists)
+                        {
+                            foreach (var aid in r.AudiosIds)
+                            {
+                                var a = response.Audios.FirstOrDefault(b => b.OwnerId + "_" + b.Id == aid);
+
+                                if (a == null) continue;
+
+                                r.Audios.Add(a);
+                            }
+                        }
+
+
+
+                    }
+                    else
+                    {
+                        foreach (var playlistStringId in block.PlaylistsIds)
+                        {
+                            var playlistArray = playlistStringId.Split('_');
+
+                            var playlistId = long.Parse(playlistArray[1]);
+                            var ownerId = long.Parse(playlistArray[0]);
+
+                            var playlist = response.Playlists.FirstOrDefault(p => p.Id == playlistId && p.OwnerId == ownerId);
+
+                            if (playlist == null) continue;
+
+                            block.Playlists.Add(playlist);
+
+                        }
+                    }
+                }
+
+                if (block.CatalogBannerIds != null || block.CatalogBannerIds.Count > 0)
+                {
+                    foreach (var bannerId in block.CatalogBannerIds)
+                    {
+                       
+                        var banner = response.CatalogBanners.FirstOrDefault(b => b.Id == bannerId );
+
+                        if (banner == null) continue;
+
+                        block.Banners.Add(banner);
+
+                    }
+                }
+
+                if (block.LinksIds != null || block.LinksIds.Count > 0)
+                {
+                    foreach (var linkId in block.LinksIds)
+                    {
+
+                        var link = response.Links.FirstOrDefault(b => b.Id == linkId);
+
+                        if (link == null) continue;
+
+                        block.Links.Add(link);
+
+                    }
+                }
+
+                if (block.PlaceholdersIds != null || block.PlaceholdersIds.Count > 0)
+                {
+                    foreach (var placeholderId in block.PlaceholdersIds)
+                    {
+
+                        var placeholder = response.Placeholders.FirstOrDefault(b => b.Id == placeholderId);
+
+                        if (placeholder == null) continue;
+
+                        block.Placeholders.Add(placeholder);
+
+                    }
+                }
+
+                if (block.SuggestionsIds != null || block.SuggestionsIds.Count > 0)
+                {
+                    foreach (var suggestionId in block.SuggestionsIds)
+                    {
+                        // first instead of single because vk was giving two identical suggestions for some queries
+                        var suggestion = response.Suggestions.FirstOrDefault(b => b.Id == suggestionId);
+
+                        if (suggestion == null) continue;
+
+                        block.Suggestions.Add(suggestion);
+
+                    }
+                }
+
+                if (block.ArtistsIds != null || block.ArtistsIds.Count > 0)
+                {
+                    foreach (var artistId in block.ArtistsIds)
+                    {
+                        var artist = response.Artists.FirstOrDefault(b => b.Id == artistId);
+
+                        if (artist == null) continue;
+
+                        block.Artists.Add(artist);
+
+                    }
+                }
+
+                if (block.TextIds != null || block.TextIds.Count > 0)
+                {
+                    foreach (var textId in block.TextIds)
+                    {
+                        var text = response.Texts.FirstOrDefault(b => b.Id == textId);
+
+                        if (text == null) continue;
+
+                        block.Texts.Add(text);
+
+                    }
+                }
+
+                if (block.GroupIds != null || block.GroupIds.Count > 0)
+                {
+                    foreach (var groupId in block.GroupIds)
+                    {
+                        var group = response.Groups.FirstOrDefault(b => b.Id == groupId);
+
+                        if (group == null) continue;
+
+                        block.Groups.Add(group);
+
+                    }
+                }
+
+                if (block.GroupsItemsIds != null || block.GroupsItemsIds.Count > 0)
+                {
+                    foreach (var groupId in block.GroupsItemsIds)
+                    {
+                        var group = response.Groups.FirstOrDefault(b => b.Id == groupId.Id);
+
+                        if (group == null) continue;
+
+                        block.Groups.Add(group);
+
+                    }
+                }
+
+                if (block.CuratorsIds != null || block.CuratorsIds.Count > 0)
+                {
+                    foreach (var curatorId in block.CuratorsIds)
+                    {
+                        var curator = response.Curators.FirstOrDefault(b => b.Id == curatorId);
+
+                        if (curator == null) continue;
+
+                        block.Curators.Add(curator);
+
+                    }
+                }
+
+                if (block.PodcastSliderItemsIds.Count > 0)
+                {
+                    foreach (var psid in block.PodcastSliderItemsIds)
+                    {
+                        try
+                        {
+                            var ps = response.PodcastSliderItems.FirstOrDefault(b => b.ItemId == psid);
+                            if (ps == null) continue;
+
+                            block.PodcastSliderItems.Add(ps);
+
+                        }catch(Exception ex)
+                        {
+                            Debug.WriteLine($"Error in psid: {psid}");
+                        }
+                    }
+                }
+
+                if (block.PodcastEpisodesIds.Count > 0)
+                {
+                    foreach (var peid in block.PodcastEpisodesIds)
+                    {
+                        var pe = response.PodcastEpisodes.FirstOrDefault(b => b.OwnerId+"_"+b.Id == peid);
+
+                        if (pe == null) continue;
+
+                        block.PodcastEpisodes.Add(pe);
+
+                    }
+                }
+
+                if (block.LongreadsIds.Count > 0)
+                {
+                    foreach (var lid in block.LongreadsIds)
+                    {
+                        var l = response.Longreads.FirstOrDefault(b => b.OwnerId + "_" + b.Id == lid);
+
+                        if (l == null) continue;
+
+                        block.Longreads.Add(l);
+
+                    }
+                }
+
+                if (block.VideosIds.Count > 0)
+                {
+                    foreach (var vid in block.VideosIds)
+                    {
+                        var v = response.Videos.FirstOrDefault(b => b.OwnerId + "_" + b.Id == vid);
+
+                        if (v == null) continue;
+
+                        block.Videos.Add(v);
+
+                    }
+                }
+
+                if (block.ArtistVideosIds.Count > 0)
+                {
+                    foreach (var vid in block.ArtistVideosIds)
+                    {
+                        var v = response.ArtistVideos.FirstOrDefault(b => b.OwnerId + "_" + b.Id == vid);
+
+                        if (v == null) continue;
+
+                        block.ArtistVideos.Add(v);
+
+                    }
+                }
+
+                if (block.MusicOwnerIds.Count > 0)
+                {
+                    foreach (var ownerId in block.MusicOwnerIds)
+                    {
+                        var owner = response.MusicOwners.FirstOrDefault(b => b.Id == ownerId);
+                        
+                        if (owner == null) continue;
+                        
+                        block.MusicOwners.Add(owner);
+                    }
+                }
+                
+                if (block.FollowingUpdateInfoIds.Count > 0)
+                {
+                    foreach (var updateInfoId in block.FollowingUpdateInfoIds)
+                    {
+                        var updateInfo = response.FollowingsUpdateInfos.FirstOrDefault(b => b.Id == updateInfoId);
+                        
+                        if (updateInfo == null) continue;
+
+                        block.FollowingsUpdateInfos.Add(updateInfo);
+                    }
+                }
+            }
+
+            var snippetsBannerIndex = response.Section.Blocks.FindIndex(b => b is { Layout.Name: "snippets_banner" });
+
+            if (snippetsBannerIndex >= 0)
+            {
+                response.Section.Blocks.RemoveAt(snippetsBannerIndex);
+                response.Section.Blocks.RemoveAt(snippetsBannerIndex); // excess separator
+            }
+
+            response.Section.Blocks.RemoveAll(block =>
+                block is { DataType: "radiostations" } or { Layout.Title: "Радиостанции" or "Эфиры" } ||
+                (
+                    block is { Banners.Count: > 0 } && 
+                    block.Banners.RemoveAll(banner => banner.ClickAction?.Action.Url.Contains("subscription") is true ||
+                                                           banner.ClickAction?.Action.Url.Contains("combo") is true ||
+                                                           banner.ClickAction?.Action.Url.Contains("https://vk.com/app") is true ||
+                                                           banner.ClickAction?.Action.Url.Contains("https://vk.com/vk_music") is true) > 0 &&
+                    block.Banners.Count == 0
+                ) ||
+                (
+                    block is { Links.Count: > 0 } && 
+                    block.Links.RemoveAll(link => link.Url.Contains("audio_offline") || 
+                                                  link.Url.Contains("radiostations") || 
+                                                  link.Url.Contains("music_transfer") || 
+                                                  link.Url.Contains("subscription")) > 0 && 
+                    block.Links.Count == 0
+                )
+            );
+
+            for (var i = 0; i < response.Section.Blocks.Count; i++)
+            {
+                var block = response.Section.Blocks[i];
+                if (block.DataType == "action" && block.Layout?.Name == "horizontal_buttons")
+                {
+                    var refBlockIndex = response.Section.Blocks.FindIndex(b => b.DataType == block.Actions[0].RefDataType && b.Layout?.Name == block.Actions[0].RefLayoutName) - 1;
+                    
+                    if (refBlockIndex >= 0 && block.Actions[0].Action.Type == "open_section")
+                    {
+                        response.Section.Blocks[refBlockIndex].Actions.AddRange(block.Actions);
+                        response.Section.Blocks.RemoveAt(i);
+                        i--;
+                    }
+                }
+            }
+
+
+            return response;
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/MusicX.Core/Models/Abstractions/IBlockEntity.cs b/MusicX.Core/Models/Abstractions/IBlockEntity.cs
deleted file mode 100644
index c89b7e36..00000000
--- a/MusicX.Core/Models/Abstractions/IBlockEntity.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace MusicX.Core.Models.Abstractions;
-
-public interface IBlockEntity<out T>
-{
-    T Id { get; }
-}
\ No newline at end of file
diff --git a/MusicX.Core/Models/Abstractions/IBlockEntityWithOwner.cs b/MusicX.Core/Models/Abstractions/IBlockEntityWithOwner.cs
deleted file mode 100644
index 84a4bf7d..00000000
--- a/MusicX.Core/Models/Abstractions/IBlockEntityWithOwner.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace MusicX.Core.Models.Abstractions;
-
-public interface IBlockEntityWithOwner<out TId, out TOwnerId> : IBlockEntity<TId>
-{
-    TOwnerId OwnerId { get; }
-}
\ No newline at end of file
diff --git a/MusicX.Core/Models/Artist.cs b/MusicX.Core/Models/Artist.cs
index bddf6764..1f5d30df 100644
--- a/MusicX.Core/Models/Artist.cs
+++ b/MusicX.Core/Models/Artist.cs
@@ -1,28 +1,29 @@
 using Newtonsoft.Json;
-using MusicX.Core.Models.Abstractions;
+using System.Collections.Generic;
 
-namespace MusicX.Core.Models;
-
-public class Artist : IBlockEntity<string>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("name")]
-    public string Name { get; set; }
-
-    [JsonProperty("domain")]
-    public string Domain { get; set; }
-
-    [JsonProperty("id")]
-    public string Id { get; set; }
-
-    [JsonProperty("is_album_cover")]
-    public bool IsAlbumCover { get; set; }
-
-    [JsonProperty("photo")]
-    public List<Image> Photo { get; set; }
-
-    [JsonProperty("is_followed")]
-    public bool IsFollowed { get; set; }
-
-    [JsonProperty("can_follow")]
-    public bool CanFollow { get; set; }
+    public class Artist
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("domain")]
+        public string Domain { get; set; }
+
+        [JsonProperty("id")]
+        public string Id { get; set; }
+
+        [JsonProperty("is_album_cover")]
+        public bool IsAlbumCover { get; set; }
+
+        [JsonProperty("photo")]
+        public List<Image> Photo { get; set; }
+        
+        [JsonProperty("is_followed")]
+        public bool IsFollowed { get; set; }
+        
+        [JsonProperty("can_follow")]
+        public bool CanFollow { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/MusicX.Core/Models/Audio.cs b/MusicX.Core/Models/Audio.cs
index b2b9e9bf..5124664c 100644
--- a/MusicX.Core/Models/Audio.cs
+++ b/MusicX.Core/Models/Audio.cs
@@ -1,115 +1,118 @@
 using Newtonsoft.Json;
-using MusicX.Core.Models.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
-namespace MusicX.Core.Models;
-
-public class Audio : IEquatable<Audio>, IBlockEntityWithOwner<long, long>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("artist")]
-    public string Artist { get; set; }
+    public class Audio : IEquatable<Audio>
+    {
+        [JsonProperty("artist")]
+        public string Artist { get; set; }
 
-    [JsonProperty("id")]
-    public long Id { get; set; }
+        [JsonProperty("id")]
+        public long Id { get; set; }
 
-    [JsonProperty("owner_id")]
-    public long OwnerId { get; set; }
+        [JsonProperty("owner_id")]
+        public long OwnerId { get; set; }
 
-    [JsonProperty("title")]
-    public string Title { get; set; }
+        [JsonProperty("title")]
+        public string Title { get; set; }
 
-    [JsonProperty("duration")]
-    public long Duration { get; set; }
+        [JsonProperty("duration")]
+        public long Duration { get; set; }
 
-    public string DurationString
-    {
-        get
+        public string DurationString
         {
-            var t = TimeSpan.FromSeconds(Duration);
-            if (t.Hours > 0)
-                return t.ToString("h\\:mm\\:ss");
-            return t.ToString("m\\:ss");
+            get
+            {
+                var t = TimeSpan.FromSeconds(Duration);
+                if (t.Hours > 0)
+                    return t.ToString("h\\:mm\\:ss");
+                return t.ToString("m\\:ss");
+            }
         }
-    }
 
-    [JsonProperty("access_key")]
-    public string AccessKey { get; set; }
+        [JsonProperty("access_key")]
+        public string AccessKey { get; set; }
 
-    [JsonProperty("is_explicit")]
-    public bool IsExplicit { get; set; }
+        [JsonProperty("is_explicit")]
+        public bool IsExplicit { get; set; }
 
-    [JsonProperty("is_focus_track")]
-    public bool IsFocusTrack { get; set; }
+        [JsonProperty("is_focus_track")]
+        public bool IsFocusTrack { get; set; }
 
-    [JsonProperty("is_licensed")]
-    public bool IsLicensed { get; set; }
+        [JsonProperty("is_licensed")]
+        public bool IsLicensed { get; set; }
 
-    [JsonProperty("track_code")]
-    public string TrackCode { get; set; }
+        [JsonProperty("track_code")]
+        public string TrackCode { get; set; }
 
-    [JsonProperty("url")]
-    public string Url { get; set; }
+        [JsonProperty("url")]
+        public string Url { get; set; }
 
-    [JsonProperty("date")]
-    public long Date { get; set; }
+        [JsonProperty("date")]
+        public long Date { get; set; }
 
-    public DateTime DateTime => new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc).AddSeconds(Date).ToLocalTime();
+        public DateTime DateTime => new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc).AddSeconds(Date).ToLocalTime();
 
-    [JsonProperty("album")]
-    public Album Album { get; set; }
+        [JsonProperty("album")]
+        public Album Album { get; set; }
 
-    [JsonProperty("main_artists")]
-    public List<MainArtist> MainArtists { get; set; }
+        [JsonProperty("main_artists")]
+        public List<MainArtist> MainArtists { get; set; }
 
-    [JsonProperty("short_videos_allowed")]
-    public bool ShortVideosAllowed { get; set; }
+        [JsonProperty("short_videos_allowed")]
+        public bool ShortVideosAllowed { get; set; }
 
-    [JsonProperty("stories_allowed")]
-    public bool StoriesAllowed { get; set; }
+        [JsonProperty("stories_allowed")]
+        public bool StoriesAllowed { get; set; }
 
-    [JsonProperty("stories_cover_allowed")]
-    public bool StoriesCoverAllowed { get; set; }
+        [JsonProperty("stories_cover_allowed")]
+        public bool StoriesCoverAllowed { get; set; }
 
-    [JsonProperty("subtitle")]
-    public string Subtitle { get; set; }
+        [JsonProperty("subtitle")]
+        public string Subtitle { get; set; }
 
-    [JsonProperty("lyrics_id")]
-    public long? LyricsId { get; set; }
+        [JsonProperty("lyrics_id")]
+        public long? LyricsId { get; set; }
 
-    [JsonProperty("has_lyrics")]
-    public bool? HasLyrics { get; set; }
+        [JsonProperty("has_lyrics")]
+        public bool? HasLyrics { get; set; }
 
-    [JsonProperty("genre_id")]
-    public long? GenreId { get; set; }
+        [JsonProperty("genre_id")]
+        public long? GenreId { get; set; }
 
-    public bool IsAvailable { get; set; } = true;
+        public bool IsAvailable { get; set; } = true;
 
 
-    [JsonProperty("featured_artists")]
-    public List<MainArtist> FeaturedArtists { get; set; }
+        [JsonProperty("featured_artists")]
+        public List<MainArtist> FeaturedArtists { get; set; }
 
-    public string ParentBlockId { get; set; }
+        public string ParentBlockId { get; set; }
 
-    public string? DownloadPlaylistName { get; set; }
-    public bool Equals(Audio? other)
-    {
-        if (ReferenceEquals(null, other))
-            return false;
-        if (ReferenceEquals(this, other))
-            return true;
-        return Id == other.Id;
-    }
-    public override bool Equals(object? obj)
-    {
-        if (ReferenceEquals(null, obj))
-            return false;
-        if (ReferenceEquals(this, obj))
-            return true;
-        if (obj.GetType() != typeof(Audio))
-            return false;
-        return Equals((Audio)obj);
-    }
-    public override int GetHashCode()
-    {
-        return Id.GetHashCode();
+        public string? DownloadPlaylistName { get; set; }
+        public bool Equals(Audio? other)
+        {
+            if (ReferenceEquals(null, other))
+                return false;
+            if (ReferenceEquals(this, other))
+                return true;
+            return Id == other.Id;
+        }
+        public override bool Equals(object? obj)
+        {
+            if (ReferenceEquals(null, obj))
+                return false;
+            if (ReferenceEquals(this, obj))
+                return true;
+            if (obj.GetType() != typeof(Audio))
+                return false;
+            return Equals((Audio)obj);
+        }
+        public override int GetHashCode()
+        {
+            return Id.GetHashCode();
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/MusicX.Core/Models/AudioFollowingsUpdateInfo.cs b/MusicX.Core/Models/AudioFollowingsUpdateInfo.cs
index 529ea7a6..743cbe67 100644
--- a/MusicX.Core/Models/AudioFollowingsUpdateInfo.cs
+++ b/MusicX.Core/Models/AudioFollowingsUpdateInfo.cs
@@ -1,17 +1,16 @@
-using MusicX.Core.Models.Abstractions;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using VkNet.Model;
 
 namespace MusicX.Core.Models;
 
-public class AudioFollowingsUpdateInfo : IBlockEntity<string>
+public class AudioFollowingsUpdateInfo
 {
     [JsonProperty("title")]
     public string Title { get; set; }
-
+    
     [JsonProperty("id")]
     public string Id { get; set; }
-
+    
     [JsonProperty("covers")]
     public List<AudioCover> Covers { get; set; }
 }
\ No newline at end of file
diff --git a/MusicX.Core/Models/CatalogBanner.cs b/MusicX.Core/Models/CatalogBanner.cs
index c8a7e1e9..86cc5e82 100644
--- a/MusicX.Core/Models/CatalogBanner.cs
+++ b/MusicX.Core/Models/CatalogBanner.cs
@@ -1,40 +1,44 @@
 using Newtonsoft.Json;
-using MusicX.Core.Models.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Text;
 
-namespace MusicX.Core.Models;
-
-public class CatalogBanner : IBlockEntity<int>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("id")]
-    public int Id { get; set; }
+    public class CatalogBanner
+    {
+        [JsonProperty("id")]
+        public int Id { get; set; }
 
-    [JsonProperty("click_action")]
-    public ClickAction? ClickAction { get; set; }
+        [JsonProperty("click_action")]
+        public ClickAction? ClickAction { get; set; }
 
-    [JsonProperty("buttons")]
-    public List<Button> Buttons { get; set; }
+        [JsonProperty("buttons")]
+        public List<Button> Buttons { get; set; }
 
-    [JsonProperty("images")]
-    public List<Image> Images { get; set; }
+        [JsonProperty("images")]
+        public List<Image> Images { get; set; }
 
-    [JsonProperty("text")]
-    public string Text { get; set; }
+        [JsonProperty("text")]
+        public string Text { get; set; }
 
-    [JsonProperty("subtext")]
-    public string SubText { get; set; }
+        [JsonProperty("subtext")]
+        public string SubText { get; set; }
 
-    [JsonProperty("title")]
-    public string Title { get; set; }
+        [JsonProperty("title")]
+        public string Title { get; set; }
 
-    [JsonProperty("track_code")]
-    public string TrackCode { get; set; }
+        [JsonProperty("track_code")]
+        public string TrackCode { get; set; }
 
-    [JsonProperty("image_mode")]
-    public string ImageMode { get; set; }
-}
+        [JsonProperty("image_mode")]
+        public string ImageMode { get; set; }
 
-public class ClickAction
-{
-    [JsonProperty("action")]
-    public ActionButton Action { get; set; }
-}
\ No newline at end of file
+    }
+
+    public class ClickAction
+    {
+        [JsonProperty("action")]
+        public ActionButton Action { get; set; }
+    }
+}
diff --git a/MusicX.Core/Models/Curator.cs b/MusicX.Core/Models/Curator.cs
index 9dd348da..21b19e6f 100644
--- a/MusicX.Core/Models/Curator.cs
+++ b/MusicX.Core/Models/Curator.cs
@@ -1,28 +1,33 @@
 using Newtonsoft.Json;
-using MusicX.Core.Models.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
-namespace MusicX.Core.Models;
-
-public class Curator : IBlockEntity<long>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("id")]
-    public long Id { get; set; }
+    public class Curator
+    {
+        [JsonProperty("id")]
+        public long Id { get; set; }
 
-    [JsonProperty("name")]
-    public string Name { get; set; }
+        [JsonProperty("name")]
+        public string Name { get; set; }
 
-    [JsonProperty("description")]
-    public string Description { get; set; }
+        [JsonProperty("description")]
+        public string Description { get; set; }
 
-    [JsonProperty("url")]
-    public string Url { get; set; }
+        [JsonProperty("url")]
+        public string Url { get; set; }
 
-    [JsonProperty("photo")]
-    public List<Image> Photo { get; set; }
+        [JsonProperty("photo")]
+        public List<Image> Photo { get; set; }
 
-    [JsonProperty("is_followed")]
-    public bool IsFollowed { get; set; }
+        [JsonProperty("is_followed")]
+        public bool IsFollowed { get; set; }
 
-    [JsonProperty("can_follow")]
-    public bool CanFollow { get; set; }
-}
\ No newline at end of file
+        [JsonProperty("can_follow")]
+        public bool CanFollow { get; set; }
+    }
+}
diff --git a/MusicX.Core/Models/General/ResponseVk.cs b/MusicX.Core/Models/General/ResponseVk.cs
index 70af07e1..804033d2 100644
--- a/MusicX.Core/Models/General/ResponseVk.cs
+++ b/MusicX.Core/Models/General/ResponseVk.cs
@@ -18,13 +18,13 @@ public class ResponseVk
     public class ResponseData
     {
         [JsonProperty("section")]
-        public Section? Section { get; set; }
+        public Section Section { get; set; }
 
         [JsonProperty("catalog")]
         public Catalog Catalog { get; set; }
 
         [JsonProperty("block")]
-        public Block? Block { get; set; }
+        public Block Block { get; set; }
 
         [JsonProperty("catalog_banners")]
         public List<CatalogBanner> CatalogBanners { get; set; }
@@ -60,7 +60,7 @@ public class ResponseData
         public List<Audio> Items { get; set; }
 
         [JsonProperty("replacements")]
-        public Replacements? Replacements { get; set; }
+        public Replacements Replacements { get; set; }
 
         [JsonProperty("profiles")]
         public List<User> Profiles { get; set; }
diff --git a/MusicX.Core/Models/Group.cs b/MusicX.Core/Models/Group.cs
index 7746c780..775e8a4f 100644
--- a/MusicX.Core/Models/Group.cs
+++ b/MusicX.Core/Models/Group.cs
@@ -4,57 +4,57 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MusicX.Core.Models.Abstractions;
 
-namespace MusicX.Core.Models;
-
-public class Group : IBlockEntity<long>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("id")]
-    public long Id { get; set; }
+    public class Group
+    {
+        [JsonProperty("id")]
+        public long Id { get; set; }
 
-    [JsonProperty("name")]
-    public string Name { get; set; }
+        [JsonProperty("name")]
+        public string Name { get; set; }
 
-    [JsonProperty("screen_name")]
-    public string ScreenName { get; set; }
+        [JsonProperty("screen_name")]
+        public string ScreenName { get; set; }
 
-    [JsonProperty("is_closed")]
-    public int IsClosed { get; set; }
+        [JsonProperty("is_closed")]
+        public int IsClosed { get; set; }
 
-    [JsonProperty("type")]
-    public string Type { get; set; }
+        [JsonProperty("type")]
+        public string Type { get; set; }
 
-    [JsonProperty("is_admin")]
-    public int IsAdmin { get; set; }
+        [JsonProperty("is_admin")]
+        public int IsAdmin { get; set; }
 
-    [JsonProperty("is_member")]
-    public int IsMember { get; set; }
+        [JsonProperty("is_member")]
+        public int IsMember { get; set; }
 
-    [JsonProperty("is_advertiser")]
-    public int IsAdvertiser { get; set; }
+        [JsonProperty("is_advertiser")]
+        public int IsAdvertiser { get; set; }
 
-    [JsonProperty("photo_50")]
-    public string Photo50 { get; set; }
+        [JsonProperty("photo_50")]
+        public string Photo50 { get; set; }
 
-    [JsonProperty("photo_100")]
-    public string Photo100 { get; set; }
+        [JsonProperty("photo_100")]
+        public string Photo100 { get; set; }
 
-    [JsonProperty("photo_200")]
-    public string Photo200 { get; set; }
+        [JsonProperty("photo_200")]
+        public string Photo200 { get; set; }
 
-    [JsonProperty("member_status")]
-    public int MemberStatus { get; set; }
+        [JsonProperty("member_status")]
+        public int MemberStatus { get; set; }
 
-    [JsonProperty("verified")]
-    public int Verified { get; set; }
+        [JsonProperty("verified")]
+        public int Verified { get; set; }
 
-    [JsonProperty("members_count")]
-    public int MembersCount { get; set; }
+        [JsonProperty("members_count")]
+        public int MembersCount { get; set; }
 
-    [JsonProperty("activity")]
-    public string Activity { get; set; }
+        [JsonProperty("activity")]
+        public string Activity { get; set; }
 
-    [JsonProperty("trending")]
-    public int Trending { get; set; }
-}
\ No newline at end of file
+        [JsonProperty("trending")]
+        public int Trending { get; set; }
+    }
+}
diff --git a/MusicX.Core/Models/Link.cs b/MusicX.Core/Models/Link.cs
index 5c8abc7f..87e34935 100644
--- a/MusicX.Core/Models/Link.cs
+++ b/MusicX.Core/Models/Link.cs
@@ -2,11 +2,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using MusicX.Core.Models.Abstractions;
 
 namespace MusicX.Core.Models
 {
-    public class Link : IBlockEntity<string>
+    public class Link
     {
         [JsonProperty("id")]
         public string Id { get; set; }
diff --git a/MusicX.Core/Models/Longread.cs b/MusicX.Core/Models/Longread.cs
index bd018d13..41b62705 100644
--- a/MusicX.Core/Models/Longread.cs
+++ b/MusicX.Core/Models/Longread.cs
@@ -4,11 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MusicX.Core.Models.Abstractions;
 
 namespace MusicX.Core.Models
 {
-    public class Longread : IBlockEntityWithOwner<int, int>
+    public class Longread
     {
         [JsonProperty("access_key")]
         public string AccessKey { get; set; }
diff --git a/MusicX.Core/Models/MusicOwner.cs b/MusicX.Core/Models/MusicOwner.cs
index 7d836fad..c79a1b1b 100644
--- a/MusicX.Core/Models/MusicOwner.cs
+++ b/MusicX.Core/Models/MusicOwner.cs
@@ -1,9 +1,8 @@
-using MusicX.Core.Models.Abstractions;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MusicX.Core.Models;
 
-public class MusicOwner : IBlockEntity<string>
+public class MusicOwner
 {
     [JsonProperty("id")]
     public string Id { get; set; }
diff --git a/MusicX.Core/Models/Placeholder.cs b/MusicX.Core/Models/Placeholder.cs
index 970ed821..63d1c5b6 100644
--- a/MusicX.Core/Models/Placeholder.cs
+++ b/MusicX.Core/Models/Placeholder.cs
@@ -4,24 +4,24 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MusicX.Core.Models.Abstractions;
 
-namespace MusicX.Core.Models;
-
-public class Placeholder : IBlockEntity<string>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("title")]
-    public string Title { get; set; }
+    public class Placeholder
+    {
+        [JsonProperty("title")]
+        public string Title { get; set; }
 
-    [JsonProperty("id")]
-    public string Id { get; set; }
+        [JsonProperty("id")]
+        public string Id { get; set; }
 
-    [JsonProperty("icons")]
-    public List<Image> Icons { get; set; } = new List<Image>();
+        [JsonProperty("icons")]
+        public List<Image> Icons { get; set; } = new List<Image>();
 
-    [JsonProperty("text")]
-    public string Text { get; set; }
+        [JsonProperty("text")]
+        public string Text { get; set; }
 
-    [JsonProperty("buttons")]
-    public List<Button> Buttons { get; set; } = new List<Button>();
-}
\ No newline at end of file
+        [JsonProperty("buttons")]
+        public List<Button> Buttons { get; set; } = new List<Button>();
+    }
+}
diff --git a/MusicX.Core/Models/Playlist.cs b/MusicX.Core/Models/Playlist.cs
index cb2a86fe..426f46bd 100644
--- a/MusicX.Core/Models/Playlist.cs
+++ b/MusicX.Core/Models/Playlist.cs
@@ -2,11 +2,10 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using MusicX.Core.Models.Abstractions;
 
 namespace MusicX.Core.Models
 {
-    public class Playlist : IBlockEntityWithOwner<long, long>
+    public class Playlist
     {
         [JsonProperty("id")]
         public long Id { get; set; }
diff --git a/MusicX.Core/Models/PodcastEpisode.cs b/MusicX.Core/Models/PodcastEpisode.cs
index 7a0874df..c763cd0a 100644
--- a/MusicX.Core/Models/PodcastEpisode.cs
+++ b/MusicX.Core/Models/PodcastEpisode.cs
@@ -4,11 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MusicX.Core.Models.Abstractions;
 
 namespace MusicX.Core.Models
 {
-    public class PodcastEpisode : IBlockEntityWithOwner<int, int>
+    public class PodcastEpisode
     {
         [JsonProperty("artist")]
         public string Artist { get; set; }
diff --git a/MusicX.Core/Models/PodcastSliderItem.cs b/MusicX.Core/Models/PodcastSliderItem.cs
index 4d8427a8..9da0cea1 100644
--- a/MusicX.Core/Models/PodcastSliderItem.cs
+++ b/MusicX.Core/Models/PodcastSliderItem.cs
@@ -1,16 +1,21 @@
 using Newtonsoft.Json;
-using MusicX.Core.Models.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
-namespace MusicX.Core.Models;
-
-public class PodcastSliderItem : IBlockEntity<string>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("item_id")]
-    public string Id { get; set; }
+    public class PodcastSliderItem
+    {
+        [JsonProperty("item_id")]
+        public string ItemId { get; set; }
 
-    [JsonProperty("slider_type")]
-    public string SliderType { get; set; }
+        [JsonProperty("slider_type")]
+        public string SliderType { get; set; }
 
-    [JsonProperty("episode")]
-    public PodcastEpisode Episode { get; set; }
-}
\ No newline at end of file
+        [JsonProperty("episode")]
+        public PodcastEpisode Episode { get; set; }
+    }
+}
diff --git a/MusicX.Core/Models/Replacements.cs b/MusicX.Core/Models/Replacements.cs
index a0a6743d..a0073894 100644
--- a/MusicX.Core/Models/Replacements.cs
+++ b/MusicX.Core/Models/Replacements.cs
@@ -19,7 +19,7 @@ public class Replacement
     public class Replacements
     {
         [JsonProperty("replacements")]
-        public List<Replacement> ReplacementsModels { get; set; } = new();
+        public List<Replacement> ReplacementsModels { get; set; }
 
         [JsonProperty("new_next_from")]
         public string NewNextFrom { get; set; }
diff --git a/MusicX.Core/Models/Suggestion.cs b/MusicX.Core/Models/Suggestion.cs
index bdb0f320..748c345e 100644
--- a/MusicX.Core/Models/Suggestion.cs
+++ b/MusicX.Core/Models/Suggestion.cs
@@ -4,11 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MusicX.Core.Models.Abstractions;
 
 namespace MusicX.Core.Models
 {
-    public class Suggestion : IBlockEntity<string>
+    public class Suggestion
     {
         [JsonProperty("id")]
         public string Id { get; set; }
diff --git a/MusicX.Core/Models/Text.cs b/MusicX.Core/Models/Text.cs
index a596438e..9b72715e 100644
--- a/MusicX.Core/Models/Text.cs
+++ b/MusicX.Core/Models/Text.cs
@@ -4,18 +4,18 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MusicX.Core.Models.Abstractions;
 
-namespace MusicX.Core.Models;
-
-public class Text : IBlockEntity<string>
+namespace MusicX.Core.Models
 {
-    [JsonProperty("id")]
-    public string Id { get; set; }
+    public class Text
+    {
+        [JsonProperty("id")]
+        public string Id { get; set; }
 
-    [JsonProperty("text")]
-    public string Value { get; set; }
+        [JsonProperty("text")]
+        public string Value { get; set; }
 
-    [JsonProperty("collapsed_lines")]
-    public int CollapsedLines { get; set; }
-}
\ No newline at end of file
+        [JsonProperty("collapsed_lines")]
+        public int CollapsedLines { get; set; }
+    }
+}
diff --git a/MusicX.Core/Models/Video.cs b/MusicX.Core/Models/Video.cs
index a6a34326..bfaa8892 100644
--- a/MusicX.Core/Models/Video.cs
+++ b/MusicX.Core/Models/Video.cs
@@ -4,11 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MusicX.Core.Models.Abstractions;
 
 namespace MusicX.Core.Models
 {
-    public class Video : IBlockEntityWithOwner<int, int>
+    public class Video
     {
         [JsonProperty("is_explicit")]
         public int IsExplicit { get; set; }
diff --git a/MusicX.Core/Services/VkService.cs b/MusicX.Core/Services/VkService.cs
index a374b2a9..52261962 100644
--- a/MusicX.Core/Services/VkService.cs
+++ b/MusicX.Core/Services/VkService.cs
@@ -142,7 +142,7 @@ public async Task<ResponseData> GetAudioCatalogAsync(string url = null)
 
                 logger.Info("Successful invoke 'catalog.getAudio' ");
 
-                return model.Process();
+                return model.Proccess();
             }catch(Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -182,7 +182,7 @@ public async ValueTask<ResponseData> GetSectionAsync(string sectionId, string st
                  logger.Info("Successful invoke 'catalog.getSection' ");
 
 
-                return model.Process();
+                return model.Proccess();
             }catch (Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -211,7 +211,7 @@ public async Task<ResponseData> GetBlockItemsAsync(string blockId)
 
                 logger.Info("Successful invoke 'catalog.getBlockItems' ");
 
-                return model.Process();
+                return model.Proccess();
             }catch(Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -245,7 +245,7 @@ public async Task<ResponseData> GetAudioSearchAsync(string query = null, string
                 var model = await apiInvoke.CallAsync<ResponseData>("catalog.getAudioSearch", parameters);
                 logger.Info("Successful invoke 'catalog.getAudioSearch' ");
 
-                return model.Process();
+                return model.Proccess();
             }catch(Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -276,7 +276,7 @@ public async Task<ResponseData> GetAudioArtistAsync(string artistId)
                 logger.Info("Successful invoke 'catalog.getAudioArtist' ");
 
 
-                return model.Process();
+                return model.Proccess();
             }catch (Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -307,7 +307,7 @@ public async Task<ResponseData> GetAudioCuratorAsync(string curatorId, string ur
                 logger.Info("Successful invoke 'catalog.getAudioCurator' ");
 
 
-                return model.Process();
+                return model.Proccess();
             }catch(Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -344,7 +344,7 @@ public async Task<ResponseData> GetPlaylistAsync(int count, long albumId, string
                 logger.Info("Successful invoke 'execute.getPlaylist' ");
 
 
-                return model.Process();
+                return model.Proccess();
             }catch(Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -604,7 +604,7 @@ public async Task<ResponseData> ReplaceBlockAsync(string replaceId)
                 logger.Info("Successful invoke 'catalog.replaceBlocks' ");
 
 
-                return model.Process();
+                return model.Proccess();
             }catch(Exception ex)
             {
                 logger.Error("VK API ERROR:");
@@ -809,7 +809,7 @@ public async Task<ResponseData> GetPodcastsAsync(string url = null)
                 logger.Info("Successful invoke 'catalog.getAudioCurator' ");
 
 
-                return model.Process();
+                return model.Proccess();
             }
             catch (Exception ex)
             {
@@ -835,7 +835,7 @@ public async Task<ResponseData> SectionHomeAsync()
 
             var model = await apiInvoke.CallAsync<ResponseData>("execute", parameters);
 
-            return model.Process();
+            return model.Proccess();
         }
 
         public async Task<ResponseData> GetRecommendationsAudio(string audio)