diff --git a/FreeTubeSync/Database/DataContext.cs b/FreeTubeSync/Database/DataContext.cs
index bebb339..e6f8165 100644
--- a/FreeTubeSync/Database/DataContext.cs
+++ b/FreeTubeSync/Database/DataContext.cs
@@ -1,4 +1,4 @@
-using FreeTubeSync.Model.Database;
+using FreeTubeSync.Model;
 using Microsoft.EntityFrameworkCore;
 
 namespace FreeTubeSync.Database;
@@ -13,10 +13,10 @@ public class DataContext : DbContext
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.Entity<Profile>()
-            .Navigation(e => e.subscriptions).AutoInclude();
+            .OwnsMany<Subscription>(o => o.subscriptions);
 
         modelBuilder.Entity<Playlist>()
-            .Navigation(e => e.videos).AutoInclude();
+            .OwnsMany<Video>(o => o.videos);
     }
 
     public override int SaveChanges()
@@ -71,7 +71,5 @@ public class DataContext : DbContext
     public DbSet<Profile> Profiles { get; set; }
     public DbSet<SearchHistory> SearchHistories { get; set; }
     public DbSet<Setting> Settings { get; set; }
-    public DbSet<Subscription> Subscriptions { get; set; }
-    public DbSet<Video> Videos { get; set; }
     public DbSet<ChangeLog> ChangeLogs { get; set; }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/EndPoints/HistoryEndpoint.cs b/FreeTubeSync/EndPoints/HistoryEndpoint.cs
index 93dac26..bf98d12 100644
--- a/FreeTubeSync/EndPoints/HistoryEndpoint.cs
+++ b/FreeTubeSync/EndPoints/HistoryEndpoint.cs
@@ -1,6 +1,4 @@
-using FreeTubeSync.Database;
-using FreeTubeSync.Model.Database;
-using FreeTubeSync.Model.Json;
+using FreeTubeSync.Model;
 
 namespace FreeTubeSync.EndPoints;
 
@@ -10,37 +8,58 @@ public static class HistoryEndpoint
     {
         var group = app.MapGroup("history");
 
-        group.MapGet("/", async (IRepository<History> repository, CancellationToken ct) =>
-        {
-            var results = await repository.GetAllAsync(ct);
-            var jsonResults = new List<HistoryJson>();
-            results.MapTo(jsonResults);
-            return Results.Ok(jsonResults);
-        });
+        group.MapGet("/", GetAllHistory);
+        group.MapGet("/{id}", GetHistory);
+        group.MapPost("/", UpdateHistory);
+        group.MapDelete("/{id}", DeleteHistory);
+    }
+    
+    private static async Task<IResult> GetAllHistory(IRepository<History> repository, CancellationToken ct)
+    {
+        var results = await repository.GetAllAsync(ct);
+        return Results.Ok(results);
+    }
 
-        group.MapPost("/", async (IRepository<History> repository, CancellationToken ct, HistoryJson historyJson) =>
+    private static async Task<IResult> GetHistory(IRepository<History> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        return result == null ? Results.NotFound() : Results.Ok(result);
+    }
+    private static async Task<IResult> UpdateHistory(IRepository<History> repository, History history, CancellationToken ct, ILogger<Program> logger)
+    {
+        var results = await repository.GetByIdAsync(history._id, ct);
+        if (results == null)
         {
-            var results = await repository.GetByIdAsync(historyJson._id, ct);
-            if (results == null)
+            try
             {
-                results = new History();
-                results.MapFrom(historyJson);
-                await repository.AddAsync(results, ct);
+                await repository.AddAsync(history, ct);
             }
-            else
+            catch (Exception ex)
             {
-                results.MapFrom(historyJson);
-                await repository.UpdateAsync(results, ct);
+                logger.LogError(ex, "Failed to create history {json}", history._id);
+                return Results.StatusCode(500);
             }
-            return Results.Ok();
-        });
+        }
+        else
+        {
+            try
+            {
+                await repository.UpdateAsync(history, ct);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed to update history {json}", history._id);
+                return Results.StatusCode(500);
+            }
+        }
+        return Results.Ok();
+    }
 
-        group.MapDelete("/{id}", async (IRepository<History> repository, CancellationToken ct, string id) =>
-        {
-            var result = await repository.GetByIdAsync(id, ct);
-            if (result == null) return Results.NotFound();
-            await repository.DeleteAsync(result, ct);
-            return Results.Ok();
-        });
+    private static async Task<IResult> DeleteHistory(IRepository<History> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        if (result == null) return Results.NotFound();
+        await repository.DeleteAsync(result, ct);
+        return Results.Ok();
     }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/EndPoints/PingEndpoint.cs b/FreeTubeSync/EndPoints/PingEndpoint.cs
index 4801636..2460ee7 100644
--- a/FreeTubeSync/EndPoints/PingEndpoint.cs
+++ b/FreeTubeSync/EndPoints/PingEndpoint.cs
@@ -1,5 +1,4 @@
 using FreeTubeSync.Database;
-using FreeTubeSync.Model.Database;
 
 namespace FreeTubeSync.EndPoints;
 
diff --git a/FreeTubeSync/EndPoints/PlaylistEndpoint.cs b/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
index 6414805..f3aeb7c 100644
--- a/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
+++ b/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
@@ -1,6 +1,4 @@
-using FreeTubeSync.Database;
-using FreeTubeSync.Model.Database;
-using FreeTubeSync.Model.Json;
+using FreeTubeSync.Model;
 
 namespace FreeTubeSync.EndPoints;
 
@@ -10,78 +8,82 @@ public static class PlaylistEndpoint
     {
         var group = app.MapGroup("playlists");
 
-        group.MapGet("/", async (IRepository<Playlist> repository, CancellationToken ct) =>
-        {
-            var results = (await repository.GetAllAsync(ct)).ToList();
-            var jsonResults = new List<PlaylistJson>();
-            results.MapTo(jsonResults);
-            for (var i = 0; i < jsonResults.Count; i++)
-                results[i].videos.MapTo(jsonResults[i].videos);
-            
-            return Results.Ok(jsonResults);
-        });
+        group.MapGet("/", GetAllPlaylists);
+        group.MapGet("/{id}", GetPlaylist);
+        group.MapPost("/", UpdatePlaylist);
+        group.MapDelete("/{id}", RemovePlaylist);
+    }
 
-        group.MapPost("/", async (IRepository<Playlist> repository, IRepository<Video> vidRepo, CancellationToken ct, PlaylistJson playlistJson) =>
+    private static async Task<IResult> GetAllPlaylists(IRepository<Playlist> repository, CancellationToken ct)
+    {
+        var results = await repository.GetAllAsync(ct);
+        return Results.Ok(results);
+    }
+
+    private static async Task<IResult> GetPlaylist(IRepository<Playlist> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        return result == null ? Results.NotFound() : Results.Ok(result);
+    }
+
+    private static async Task<IResult> UpdatePlaylist(IRepository<Playlist> repository, Playlist playlist, CancellationToken ct,
+        ILogger<Program> logger)
+    {
+        var results = await repository.GetByIdAsync(playlist._id, ct);
+        if (results == null)
         {
-            var results = await repository.GetByIdAsync(playlistJson._id, ct);
-            if (results == null)
+            try
             {
-                results = new Playlist();
-                results.MapFrom(playlistJson);
-                foreach (var video in playlistJson.videos)
-                {
-                    var vid = new Video();
-                    vid.MapFrom(video);
+                await repository.AddAsync(playlist, ct);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed to create Playlist {playlist}", playlist._id);
+                return Results.StatusCode(500);
+            }
+        }
+        else
+        {
+            // Add Update Code here
+            var toRemove = results.videos.Where(vid => !playlist.videos.Any(x => x.playlistItemId == vid.playlistItemId)).ToList();
+
+            results.lastUpdatedAt = playlist.lastUpdatedAt;
+            results.@protected = playlist.@protected;
+            results.playlistName = playlist.playlistName;
+            results.createdAt = playlist.createdAt;
+
+            foreach (var vid in toRemove)
+                results.videos.Remove(vid);
+
+            foreach (var vid in playlist.videos)
+            {
+                var ovid = results.videos.FirstOrDefault(x => x.playlistItemId == vid.playlistItemId);
+                if (ovid == null)
                     results.videos.Add(vid);
+                else
+                {
+                    ovid.videoId = vid.videoId;
+                    ovid.title = vid.title;
+                    ovid.author = vid.author;
+                    ovid.authorId = vid.authorId;
+                    ovid.lengthSeconds = vid.lengthSeconds;
+                    ovid.published = vid.published;
+                    ovid.timeAdded = vid.timeAdded;
+                    ovid.playlistItemId = vid.playlistItemId;
+                    ovid.type = vid.type;
                 }
-                await repository.AddAsync(results, ct);
             }
-            else
-            {
-                results.MapFrom(playlistJson);
+            await repository.UpdateAsync(results, ct);
+        }
 
-                var notFound = new List<Video>();
-                foreach (var video in results.videos)
-                {
-                    var f = playlistJson.videos.FirstOrDefault(v => video.playlistItemId == v.playlistItemId);
-                    if (f == null)
-                        notFound.Add(video);
-                    else
-                    {
-                        video.MapFrom(f);
-                    }
-                }
-
-                var newVids = (from video in playlistJson.videos
-                    let f = results.videos.FirstOrDefault(v => v.playlistItemId == video.playlistItemId)
-                    where f == null
-                    select video).ToList();
-
-                foreach (var newVid in newVids)
-                {
-                    var vres = new Video();
-                    vres.MapFrom(newVid);
-                    results.videos.Add(vres);
-                }
-
-                foreach (var nfVid in notFound)
-                {
-                    await vidRepo.DeleteAsync(nfVid, ct, false);
-                    results.videos.Remove(nfVid);
-                }
-
-                await repository.UpdateAsync(results, ct);
-            }
-
-            return Results.Ok();
-        });
-
-        group.MapDelete("/{id}", async (IRepository<Playlist> repository, CancellationToken ct, string id) =>
-        {
-            var result = await repository.GetByIdAsync(id, ct);
-            if (result == null) return Results.NotFound();
-            await repository.DeleteAsync(result, ct);
-            return Results.Ok();
-        });
+        return Results.Ok();
+    }
+    
+    private static async Task<IResult> RemovePlaylist(IRepository<Playlist> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        if (result == null) return Results.NotFound();
+        await repository.DeleteAsync(result, ct);
+        return Results.Ok();
     }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/EndPoints/ProfileEndpoint.cs b/FreeTubeSync/EndPoints/ProfileEndpoint.cs
index 44e3e69..4d97ca1 100644
--- a/FreeTubeSync/EndPoints/ProfileEndpoint.cs
+++ b/FreeTubeSync/EndPoints/ProfileEndpoint.cs
@@ -1,6 +1,4 @@
-using FreeTubeSync.Database;
-using FreeTubeSync.Model.Database;
-using FreeTubeSync.Model.Json;
+using FreeTubeSync.Model;
 
 namespace FreeTubeSync.EndPoints;
 
@@ -10,78 +8,73 @@ public static class ProfileEndpoint
     {
         var group = app.MapGroup("profile");
 
-        group.MapGet("/", async (IRepository<Profile> repository, CancellationToken ct) =>
-        {
-            var results = (await repository.GetAllAsync(ct)).ToList();
-            var jsonResults = new List<ProfileJson>();
-            results.MapTo(jsonResults);
-            for (var i = 0; i < jsonResults.Count; i++)
-                results[i].subscriptions.MapTo(jsonResults[i].subscriptions);
-            return Results.Ok(results);
-        });
+        group.MapGet("/", GetAllProfiles);
+        group.MapGet("/{id}", GetProfile);
+        group.MapPost("/", UpdateProfile);
+        group.MapDelete("/{id}", DeleteProfile);
+    }
 
-        group.MapPost("/", async (IRepository<Profile> repository, IRepository<Subscription> subRepo, CancellationToken ct, ProfileJson profileJson) =>
+    private static async Task<IResult> GetAllProfiles(IRepository<Profile> repository, CancellationToken ct)
+    {
+        var results = await repository.GetAllAsync(ct);
+        return Results.Ok(results);
+    }
+
+    private static async Task<IResult> GetProfile(IRepository<Profile> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        return result == null ? Results.NotFound() : Results.Ok(result);
+    }
+
+    private static async Task<IResult> UpdateProfile(IRepository<Profile> repository, Profile profile, CancellationToken ct, ILogger<Program> logger)
+    {
+        var res = await repository.GetByIdAsync(profile._id, ct);
+        if (res == null)
         {
-            var res = await repository.GetByIdAsync(profileJson._id, ct);
-            if (res == null)
+            try
             {
-                res = new Profile();
-                res.MapFrom(profileJson);
-                await repository.AddAsync(res, ct);
-                
-                foreach (var subscription in profileJson.subscriptions)
-                {
-                    var sub = new Subscription();
-                    sub.MapFrom(subscription);
+                await repository.AddAsync(profile, ct);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed to create profile {json}", profile._id);
+                return Results.StatusCode(500);
+            }
+        }
+        else
+        {
+            var toRemove = res.subscriptions.Where(sub => !profile.subscriptions.Any(x => x.id == sub.id)).ToList();
+
+            res.name = profile.name;
+            res.textColor = profile.textColor;
+            res.bgColor = profile.bgColor;
+
+            foreach (var sub in toRemove)
+                res.subscriptions.Remove(sub);
+
+            foreach (var sub in profile.subscriptions)
+            {
+                var osub = res.subscriptions.FirstOrDefault(x => x.id == sub.id);
+                if (osub == null)
                     res.subscriptions.Add(sub);
-                }
-                await repository.AddAsync(res, ct);
-            }
-            else
-            {
-                res.MapFrom(profileJson);
-                var notFound = new List<Subscription>();
-                foreach (var subscription in res.subscriptions)
+                else
                 {
-                    var f = profileJson.subscriptions.FirstOrDefault(s => s.id == subscription.id);
-                    if (f == null)
-                        notFound.Add(subscription);
-                    else
-                    {
-                        subscription.MapFrom(f);
-                    }
+                    osub.name = sub.name;
+                    osub.thumbnail = sub.thumbnail;
                 }
-
-                var newSubs = (from subscription in profileJson.subscriptions
-                    let f = res.subscriptions.FirstOrDefault(s => s.id == subscription.id)
-                    where f == null
-                    select subscription).ToList();
-
-                foreach (var newSub in newSubs)
-                {
-                    var sres = new Subscription();
-                    sres.MapFrom(newSub);
-                    res.subscriptions.Add(sres);
-                }
-
-                foreach (var nfSub in notFound)
-                {
-                    await subRepo.DeleteAsync(nfSub, ct, false);
-                    res.subscriptions.Remove(nfSub);
-                }
-
-                await repository.UpdateAsync(res, ct);
             }
 
-            return Results.Ok();
-        });
+            await repository.UpdateAsync(res, ct);
+        }
 
-        group.MapDelete("/{id}", async (IRepository<Profile> repository, CancellationToken ct, string id) =>
-        {
-            var result = await repository.GetByIdAsync(id, ct);
-            if (result == null) return Results.NotFound();
-            await repository.DeleteAsync(result, ct);
-            return Results.Ok();
-        });
+        return Results.Ok();
+    }
+
+    private static async Task<IResult> DeleteProfile(IRepository<Profile> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        if (result == null) return Results.NotFound();
+        await repository.DeleteAsync(result, ct);
+        return Results.Ok();
     }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs b/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
index 78efacb..c9b0f3f 100644
--- a/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
+++ b/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
@@ -1,6 +1,4 @@
-using FreeTubeSync.Database;
-using FreeTubeSync.Model.Database;
-using FreeTubeSync.Model.Json;
+using FreeTubeSync.Model;
 
 namespace FreeTubeSync.EndPoints;
 
@@ -10,39 +8,61 @@ public static class SearchHistoryEndpoint
     {
         var group = app.MapGroup("searchHistory");
 
-        group.MapGet("/", async (IRepository<SearchHistory> repository, CancellationToken ct) =>
-        {
-            var result = await repository.GetAllAsync(ct);
-            var jsonResults = new List<SearchHistoryJson>();
-            result.MapTo(jsonResults);
-            return Results.Ok(jsonResults);
-        });
+        group.MapGet("/", GetAllSearchHistory);
+        group.MapGet("/{id}", GetSearchHistory);
+        group.MapPost("/", UpdateSearchHistory);
+        group.MapDelete("/{id}", DeleteSearchHistory);
+    }
 
-        group.MapPost("/", async (IRepository<SearchHistory> repository, CancellationToken ct, SearchHistoryJson historyJson) =>
+    private static async Task<IResult> GetAllSearchHistory(IRepository<SearchHistory> repository, CancellationToken ct)
+    {
+        var results = await repository.GetAllAsync(ct);
+        return Results.Ok(results);
+    }
+
+    private static async Task<IResult> GetSearchHistory(IRepository<SearchHistory> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        return result == null ? Results.NotFound() : Results.Ok(result);
+    }
+
+    private static async Task<IResult> UpdateSearchHistory(IRepository<SearchHistory> repository, SearchHistory history, CancellationToken ct,
+        ILogger<Program> logger)
+    {
+        var result = await repository.GetByIdAsync(history._id, ct);
+        if (result == null)
         {
-            var result = await repository.GetByIdAsync(historyJson._id, ct);
-            if (result == null)
+            try
             {
-                result = new SearchHistory();
-                result.MapFrom(historyJson);
-                await repository.AddAsync(result, ct);
+                await repository.AddAsync(history, ct);
             }
-            else
+            catch (Exception e)
             {
-                result.MapFrom(historyJson);
-                await repository.UpdateAsync(result, ct);
+                logger.LogError(e, "Failed to update history {json}", history._id);
+                return Results.StatusCode(500);
             }
-
-            return Results.Ok();
-        });
-
-        group.MapDelete("/{id}", async (IRepository<SearchHistory> repository, CancellationToken ct, string id) =>
+        }
+        else
         {
-            var result = await repository.GetByIdAsync(id, ct);
-            if (result == null) return Results.NotFound();
-            await repository.DeleteAsync(result, ct);
-            return Results.Ok();
+            try
+            {
+                await repository.UpdateAsync(history, ct);
+            }
+            catch (Exception e)
+            {
+                logger.LogError(e, "Failed to update history {json}", history._id);
+                return Results.StatusCode(500);
+            }
+        }
 
-        });
+        return Results.Ok();
+    }
+
+    private static async Task<IResult> DeleteSearchHistory(IRepository<SearchHistory> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        if (result == null) return Results.NotFound();
+        await repository.DeleteAsync(result, ct);
+        return Results.Ok();
     }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/EndPoints/SettingEndpoint.cs b/FreeTubeSync/EndPoints/SettingEndpoint.cs
index 94f2349..bd21d2e 100644
--- a/FreeTubeSync/EndPoints/SettingEndpoint.cs
+++ b/FreeTubeSync/EndPoints/SettingEndpoint.cs
@@ -1,6 +1,4 @@
-using FreeTubeSync.Database;
-using FreeTubeSync.Model.Database;
-using FreeTubeSync.Model.Json;
+using FreeTubeSync.Model;
 
 namespace FreeTubeSync.EndPoints;
 
@@ -10,37 +8,59 @@ public static class SettingEndpoint
     {
         var group = app.MapGroup("settings");
 
-        group.MapGet("/", async (IRepository<Setting> repository, CancellationToken ct) =>
-        {
-            var settings = await repository.GetAllAsync(ct);
-            var jsonSettings = new List<SettingJson>();
-            settings.MapTo(jsonSettings);
-            return Results.Ok(jsonSettings);
-        });
+        group.MapGet("/", GetAllSettings);
+        group.MapGet("/{id}", GetSetting);
+        group.MapPost("/", UpdateSetting);
+        group.MapDelete("/{id}", DeleteSetting);
+    }
 
-        group.MapPost("/", async (IRepository<Setting> repository, CancellationToken ct, SettingJson settingJson) =>
-        {
-            var res = await repository.GetByIdAsync(settingJson._id, ct);
-            if (res == null)
-            {
-                res = new Setting();
-                res.MapFrom(settingJson);
-                await repository.AddAsync(res, ct);
-            }
-            else
-            {
-                res.MapFrom(settingJson);
-                await repository.UpdateAsync(res, ct);
-            }
-            return Results.Ok();
-        });
+    private static async Task<IResult> GetAllSettings(IRepository<Setting> repository, CancellationToken ct)
+    {
+        var settings = await repository.GetAllAsync(ct);
+        return Results.Ok(settings);
+    }
 
-        group.MapDelete("/{id}", async (IRepository<Setting> repository, CancellationToken ct, string id) =>
+    private static async Task<IResult> GetSetting(IRepository<Setting> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        return result == null ? Results.NotFound() : Results.Ok(result);
+    }
+
+    private static async Task<IResult> UpdateSetting(IRepository<Setting> repository, Setting setting, CancellationToken ct, ILogger<Program> logger)
+    {
+        var res = await repository.GetByIdAsync(setting._id, ct);
+        if (res == null)
         {
-            var result = await repository.GetByIdAsync(id, ct);
-            if (result == null) return Results.NotFound();
-            await repository.DeleteAsync(result, ct);
-            return Results.Ok();
-        });
+            try
+            {
+                await repository.AddAsync(setting, ct);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed to add setting {setting}",  setting._id);
+                return Results.StatusCode(500);
+            }
+        }
+        else
+        {
+            try
+            {
+                await repository.UpdateAsync(setting, ct);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Failed to update setting {setting}", setting._id);
+                return Results.StatusCode(500);
+            }
+        }
+        return Results.Ok();
+    }
+
+    private static async Task<IResult> DeleteSetting(IRepository<Setting> repository, string id, CancellationToken ct)
+    {
+        var result = await repository.GetByIdAsync(id, ct);
+        if (result == null) return Results.NotFound();
+        await repository.DeleteAsync(result, ct);
+        return Results.Ok();
     }
 }
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Database/ChangeLog.cs b/FreeTubeSync/Model/ChangeLog.cs
similarity index 86%
rename from FreeTubeSync/Model/Database/ChangeLog.cs
rename to FreeTubeSync/Model/ChangeLog.cs
index 8d6a7f5..d1e6734 100644
--- a/FreeTubeSync/Model/Database/ChangeLog.cs
+++ b/FreeTubeSync/Model/ChangeLog.cs
@@ -1,4 +1,4 @@
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
 public class ChangeLog
 {
diff --git a/FreeTubeSync/Model/Database/History.cs b/FreeTubeSync/Model/History.cs
similarity index 95%
rename from FreeTubeSync/Model/Database/History.cs
rename to FreeTubeSync/Model/History.cs
index 75627ec..09ecba2 100644
--- a/FreeTubeSync/Model/Database/History.cs
+++ b/FreeTubeSync/Model/History.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
 public class History
 {
diff --git a/FreeTubeSync/Model/Json/HistoryJson.cs b/FreeTubeSync/Model/Json/HistoryJson.cs
deleted file mode 100644
index 48c1688..0000000
--- a/FreeTubeSync/Model/Json/HistoryJson.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace FreeTubeSync.Model.Json;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-public class HistoryJson
-{
-    public string _id { get; set; } = string.Empty;
-    public string videoId { get; set; } = string.Empty;
-    public string title { get; set; } = string.Empty;
-    public string author { get; set; } = string.Empty;
-    public string authorId { get; set; } = string.Empty;
-    public long published { get; set; }
-    public string description { get; set; } = string.Empty;
-    public long viewCount { get; set; }
-    public long lengthSeconds { get; set; }
-    public float watchProgress { get; set; }
-    public long timeWatched { get; set; }
-    public bool isLive { get; set; }
-    public string type { get; set; } = string.Empty;
-    public string lastViewedPlaylistType { get; set; } = string.Empty;
-    public string? lastViewedPlaylistItemId { get; set; }
-}
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Json/PlaylistJson.cs b/FreeTubeSync/Model/Json/PlaylistJson.cs
deleted file mode 100644
index d157397..0000000
--- a/FreeTubeSync/Model/Json/PlaylistJson.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace FreeTubeSync.Model.Json;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-public class PlaylistJson
-{
-    public string _id { get; set; } = string.Empty;
-    public string playlistName { get; set; } = string.Empty;
-    public bool @protected { get; set; }
-    public List<VideoJson> videos { get; set; } = [];
-    public long createdAt { get; set; }
-    public long lastUpdatedAt { get; set; }
-}
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Json/ProfileJson.cs b/FreeTubeSync/Model/Json/ProfileJson.cs
deleted file mode 100644
index b89f4e4..0000000
--- a/FreeTubeSync/Model/Json/ProfileJson.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace FreeTubeSync.Model.Json;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-public class ProfileJson
-{
-    public string _id { get; set; } = string.Empty;
-    public string name { get; set; } = string.Empty;
-    public string bgColor { get; set; } = string.Empty;
-    public string textColor { get; set; } = string.Empty;
-    public List<SubscriptionJson> subscriptions { get; set; } = [];
-}
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Json/SearchHistoryJson.cs b/FreeTubeSync/Model/Json/SearchHistoryJson.cs
deleted file mode 100644
index 99a8df6..0000000
--- a/FreeTubeSync/Model/Json/SearchHistoryJson.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace FreeTubeSync.Model.Json;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-public class SearchHistoryJson
-{
-    public string _id { get; set; } = string.Empty;
-    public long lastUpdatedAt { get; set; }
-}
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Json/SettingJson.cs b/FreeTubeSync/Model/Json/SettingJson.cs
deleted file mode 100644
index a9d8f9a..0000000
--- a/FreeTubeSync/Model/Json/SettingJson.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace FreeTubeSync.Model.Json;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-public class SettingJson
-{
-    public string _id { get; set; } = string.Empty;
-    public string value { get; set; } 
-}
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Json/SubscriptionJson.cs b/FreeTubeSync/Model/Json/SubscriptionJson.cs
deleted file mode 100644
index ebe3e19..0000000
--- a/FreeTubeSync/Model/Json/SubscriptionJson.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace FreeTubeSync.Model.Json;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-public class SubscriptionJson
-{
-    public string id { get; set; } = string.Empty;
-    public string name { get; set; } = string.Empty;
-    public string? thumbnail { get; set; }
-}
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Json/VideoJson.cs b/FreeTubeSync/Model/Json/VideoJson.cs
deleted file mode 100644
index 4bff0de..0000000
--- a/FreeTubeSync/Model/Json/VideoJson.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace FreeTubeSync.Model.Json;
-
-[SuppressMessage("ReSharper", "InconsistentNaming")]
-public class VideoJson
-{
-    public string videoId { get; set; } = string.Empty;
-    public string title { get; set; } = string.Empty;
-    public string author { get; set; } = string.Empty;
-    public string authorId { get; set; } = string.Empty;
-    public string lengthSeconds { get; set; } = string.Empty;
-    public long pubished { get; set; }
-    public long timeAdded { get; set; }
-    public string playlistItemId { get; set; } = string.Empty;
-    public string type { get; set; } = string.Empty;
-
-}
\ No newline at end of file
diff --git a/FreeTubeSync/Model/Database/Playlist.cs b/FreeTubeSync/Model/Playlist.cs
similarity index 90%
rename from FreeTubeSync/Model/Database/Playlist.cs
rename to FreeTubeSync/Model/Playlist.cs
index 0ee3328..83d6bf7 100644
--- a/FreeTubeSync/Model/Database/Playlist.cs
+++ b/FreeTubeSync/Model/Playlist.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
 public class Playlist
 {
diff --git a/FreeTubeSync/Model/Database/Profile.cs b/FreeTubeSync/Model/Profile.cs
similarity index 90%
rename from FreeTubeSync/Model/Database/Profile.cs
rename to FreeTubeSync/Model/Profile.cs
index e19f40e..658c21d 100644
--- a/FreeTubeSync/Model/Database/Profile.cs
+++ b/FreeTubeSync/Model/Profile.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
 public class Profile
 {
diff --git a/FreeTubeSync/Model/Database/SearchHistory.cs b/FreeTubeSync/Model/SearchHistory.cs
similarity index 82%
rename from FreeTubeSync/Model/Database/SearchHistory.cs
rename to FreeTubeSync/Model/SearchHistory.cs
index c999af3..e4c4080 100644
--- a/FreeTubeSync/Model/Database/SearchHistory.cs
+++ b/FreeTubeSync/Model/SearchHistory.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
 public class SearchHistory
 {
diff --git a/FreeTubeSync/Model/Database/Setting.cs b/FreeTubeSync/Model/Setting.cs
similarity index 79%
rename from FreeTubeSync/Model/Database/Setting.cs
rename to FreeTubeSync/Model/Setting.cs
index 73c66f9..6c8992c 100644
--- a/FreeTubeSync/Model/Database/Setting.cs
+++ b/FreeTubeSync/Model/Setting.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
 public class Setting
 {
diff --git a/FreeTubeSync/Model/Database/Subscription.cs b/FreeTubeSync/Model/Subscription.cs
similarity index 65%
rename from FreeTubeSync/Model/Database/Subscription.cs
rename to FreeTubeSync/Model/Subscription.cs
index 5623c4e..8a5f84b 100644
--- a/FreeTubeSync/Model/Database/Subscription.cs
+++ b/FreeTubeSync/Model/Subscription.cs
@@ -1,10 +1,10 @@
-using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
 
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
+[Owned]
 public class Subscription
 {
-    [Key]
     public string id { get; set; } = string.Empty;
     public string name { get; set; } = string.Empty;
     public string? thumbnail { get; set; }
diff --git a/FreeTubeSync/Model/Database/Video.cs b/FreeTubeSync/Model/Video.cs
similarity index 77%
rename from FreeTubeSync/Model/Database/Video.cs
rename to FreeTubeSync/Model/Video.cs
index 3a08816..fc0a5cd 100644
--- a/FreeTubeSync/Model/Database/Video.cs
+++ b/FreeTubeSync/Model/Video.cs
@@ -1,7 +1,8 @@
-using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
 
-namespace FreeTubeSync.Model.Database;
+namespace FreeTubeSync.Model;
 
+[Owned]
 public class Video
 {
     public string videoId { get; set; } = string.Empty;
@@ -9,9 +10,8 @@ public class Video
     public string author { get; set; } = string.Empty;
     public string authorId { get; set; } = string.Empty;
     public string lengthSeconds { get; set; } = string.Empty;
-    public long pubished { get; set; }
+    public long published { get; set; }
     public long timeAdded { get; set; }
-    [Key]
     public string playlistItemId { get; set; } = string.Empty;
     public string type { get; set; } = string.Empty;
 }
\ No newline at end of file
diff --git a/FreeTubeSync/Repository.cs b/FreeTubeSync/Repository.cs
index 8585e98..286e7c3 100644
--- a/FreeTubeSync/Repository.cs
+++ b/FreeTubeSync/Repository.cs
@@ -3,36 +3,46 @@ using Microsoft.EntityFrameworkCore;
 
 namespace FreeTubeSync;
 
-public class Repository<TEntity>(DataContext dbContext) : IRepository<TEntity> where TEntity : class
+public class Repository<TEntity> : IRepository<TEntity> where TEntity : class
 {
+    private readonly DataContext _context;
+    private readonly DbSet<TEntity> _dbSet;
+
+    public Repository(DataContext context)
+    {
+        _context = context;
+        _dbSet = _context.Set<TEntity>();
+    }
+    
     public async Task AddAsync(TEntity entity, CancellationToken ct, bool sync = true)
     {
-        dbContext.Set<TEntity>().Add(entity);
+        _dbSet.Add(entity);
         if(sync)
-            await dbContext.SaveChangesAsync(ct);
+            await _context.SaveChangesAsync(ct);
     }
 
     public async Task UpdateAsync(TEntity entity, CancellationToken ct, bool sync = true)
     {
-        dbContext.Set<TEntity>().Update(entity);
+        _dbSet.Attach(entity);
+        _context.Entry(entity).State = EntityState.Modified;
         if (sync)
-            await dbContext.SaveChangesAsync(ct);
+            await _context.SaveChangesAsync(ct);
     }
 
     public async Task DeleteAsync(TEntity entity, CancellationToken ct, bool sync = true)
     {
-        dbContext.Set<TEntity>().Remove(entity);
+        _dbSet.Remove(entity);
         if (sync)
-            await dbContext.SaveChangesAsync(ct);
+            await _context.SaveChangesAsync(ct);
     }
 
     public async Task<TEntity?> GetByIdAsync(string id, CancellationToken ct)
     {
-        return await dbContext.Set<TEntity>().FindAsync(id, ct);
+        return await _dbSet.FindAsync(id, ct);
     }
 
     public async Task<IEnumerable<TEntity>> GetAllAsync(CancellationToken ct)
     {
-        return await dbContext.Set<TEntity>().ToListAsync<TEntity>(ct);
+        return await _dbSet.ToListAsync<TEntity>(ct);
     }
 }
\ No newline at end of file