diff --git a/GameDatabase/Context/TaikoDbContext.cs b/GameDatabase/Context/TaikoDbContext.cs
index 2ea9f7e..7e95b79 100644
--- a/GameDatabase/Context/TaikoDbContext.cs
+++ b/GameDatabase/Context/TaikoDbContext.cs
@@ -1,4 +1,5 @@
-using GameDatabase.Entities;
+using EntityFramework.Exceptions.Sqlite;
+using GameDatabase.Entities;
 using Microsoft.EntityFrameworkCore;
 using SharedProject.Utils;
 
@@ -40,6 +41,7 @@ namespace GameDatabase.Context
                 path = dbFilePath;
             }
             optionsBuilder.UseSqlite($"Data Source={path}");
+            optionsBuilder.UseExceptionProcessor().EnableSensitiveDataLogging();
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
diff --git a/GameDatabase/GameDatabase.csproj b/GameDatabase/GameDatabase.csproj
index 9cb07e7..e9c5cfc 100644
--- a/GameDatabase/GameDatabase.csproj
+++ b/GameDatabase/GameDatabase.csproj
@@ -12,7 +12,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.2.23480.1" />
+        <PackageReference Include="EntityFrameworkCore.Exceptions.Sqlite" Version="8.1.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.2.23480.1">
             <PrivateAssets>all</PrivateAssets>
diff --git a/LocalSaveModScoreMigrator/LocalSaveModScoreMigrator.csproj b/LocalSaveModScoreMigrator/LocalSaveModScoreMigrator.csproj
index e11aede..6b4cbcf 100644
--- a/LocalSaveModScoreMigrator/LocalSaveModScoreMigrator.csproj
+++ b/LocalSaveModScoreMigrator/LocalSaveModScoreMigrator.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
       <PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.2.23480.1" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
       <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
       <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.2.23480.1">
         <PrivateAssets>all</PrivateAssets>
diff --git a/TaikoLocalServer/Handlers/AddTokenCountCommand.cs b/TaikoLocalServer/Handlers/AddTokenCountCommand.cs
index 6b5ee0b..091a5aa 100644
--- a/TaikoLocalServer/Handlers/AddTokenCountCommand.cs
+++ b/TaikoLocalServer/Handlers/AddTokenCountCommand.cs
@@ -40,6 +40,7 @@ public class AddTokenCountCommandHandler : IRequestHandler<AddTokenCountCommand>
             {
                 user.Tokens.Add(new Token
                 {
+                    Baid = user.Baid,
                     Id = (int)tokenId,
                     Count = addTokenCount
                 });
diff --git a/TaikoLocalServer/Handlers/UpdatePlayResultCommand.cs b/TaikoLocalServer/Handlers/UpdatePlayResultCommand.cs
index 330d7a8..66761d8 100644
--- a/TaikoLocalServer/Handlers/UpdatePlayResultCommand.cs
+++ b/TaikoLocalServer/Handlers/UpdatePlayResultCommand.cs
@@ -18,7 +18,7 @@ public class UpdatePlayResultCommandHandler(TaikoDbContext context, ILogger<Upda
             return 1;
         }
 
-        var user = await context.UserData.FindAsync(request.Baid, cancellationToken);
+        var user = await context.UserData.FindAsync([request.Baid], cancellationToken);
         if (user is null)
         {
             logger.LogWarning("Game uploading a non exisiting user with baid {Baid}", request.Baid);
@@ -52,7 +52,6 @@ public class UpdatePlayResultCommandHandler(TaikoDbContext context, ILogger<Upda
             else
             {
                 UpdateDanPlayData(danPlayData, playResultData);
-                context.DanScoreData.Update(danPlayData);
             }
 
             await context.SaveChangesAsync(cancellationToken);
@@ -68,7 +67,32 @@ public class UpdatePlayResultCommandHandler(TaikoDbContext context, ILogger<Upda
                 await UpdateAiBattleData(playResultData, stageData);
             }
 
-            await UpdateBestData(playResultData, stageData);
+            var difficulty = (Difficulty)stageData.Level;
+            difficulty.Throw().IfOutOfRange();
+            var existing = await context.SongBestData.FindAsync([playResultData.Baid, stageData.SongNo, difficulty], cancellationToken);
+
+            // Determine whether it is dondaful crown as this is not reflected by play result
+            var crown = PlayResultToCrown(stageData.PlayResult, stageData.OkCnt);
+
+            if (existing is null)
+            {
+                var datum = new SongBestDatum
+                {
+                    Baid = playResultData.Baid,
+                    SongId = stageData.SongNo,
+                    Difficulty = difficulty,
+                    BestScore = stageData.PlayScore,
+                    BestRate = stageData.ScoreRate,
+                    BestCrown = crown,
+                    BestScoreRank = (ScoreRank)stageData.ScoreRank
+                };
+
+                context.SongBestData.Add(datum);
+            }
+            else
+            {
+                existing.UpdateBestData(crown, stageData.ScoreRank, stageData.PlayScore, stageData.ScoreRate);
+            }
 
             var songPlayDatum = new SongPlayDatum
             {
@@ -96,37 +120,6 @@ public class UpdatePlayResultCommandHandler(TaikoDbContext context, ILogger<Upda
         return 1;
     }
 
-    private async Task UpdateBestData(CommonPlayResultData playResultData, CommonPlayResultData.StageData stageData)
-    {
-        var difficulty = (Difficulty)stageData.Level;
-        difficulty.Throw().IfOutOfRange();
-        var existing = await context.SongBestData.FindAsync(playResultData.Baid, stageData.SongNo, difficulty);
-        
-
-        // Determine whether it is dondaful crown as this is not reflected by play result
-        var crown = PlayResultToCrown(stageData.PlayResult, stageData.OkCnt);
-
-        if (existing is null)
-        {
-            existing = new SongBestDatum
-            {
-                Baid = playResultData.Baid,
-                SongId = stageData.SongNo,
-                Difficulty = difficulty,
-                BestScore = stageData.PlayScore,
-                BestRate = stageData.ScoreRate,
-                BestCrown = crown,
-                BestScoreRank = (ScoreRank)stageData.ScoreRank
-            };
-
-            context.SongBestData.Add(existing);
-            return;
-        }
-
-        existing.UpdateBestData(crown, stageData.ScoreRank, stageData.PlayScore, stageData.ScoreRate);
-        context.SongBestData.Update(existing);
-    }
-
     private async Task UpdateAiBattleData(CommonPlayResultData playResultData, CommonPlayResultData.StageData stageData)
     {
         var difficulty = (Difficulty)stageData.Level;
@@ -135,7 +128,10 @@ public class UpdatePlayResultCommandHandler(TaikoDbContext context, ILogger<Upda
             .Include(datum => datum.AiSectionScoreData)
             .FirstOrDefaultAsync(datum => datum.Baid == playResultData.Baid &&
                                           datum.SongId == stageData.SongNo &&
-                                          datum.Difficulty == difficulty);
+                                          datum.Difficulty == difficulty)
+            ?? context.AiScoreData.Local.FirstOrDefault(datum => datum.Baid == playResultData.Baid &&
+                                                                             datum.SongId == stageData.SongNo &&
+                                                                             datum.Difficulty == difficulty);
         if (existing is null)
         {
             existing = new AiScoreDatum
@@ -185,10 +181,8 @@ public class UpdatePlayResultCommandHandler(TaikoDbContext context, ILogger<Upda
                 };
                 aiSectionScoreDatum.UpdateBest(sectionData);
                 existing.AiSectionScoreData.Add(aiSectionScoreDatum);
-                context.AiScoreData.Update(existing);
             }
         }
-        
     }
     
     private void UpdateDanPlayData(DanScoreDatum danPlayData, CommonPlayResultData playResultData)
@@ -269,7 +263,6 @@ public class UpdatePlayResultCommandHandler(TaikoDbContext context, ILogger<Upda
         user.DifficultyPlayedArray = JsonSerializer.Serialize(difficultyPlayedArray);
 
         user.AiWinCount += playResultData.AryStageInfoes.Count(data => data.IsWin);
-        context.UserData.Update(user);
     }
     
     private static CrownType PlayResultToCrown(uint playResult, uint okCount)
diff --git a/TaikoLocalServer/TaikoLocalServer.csproj b/TaikoLocalServer/TaikoLocalServer.csproj
index 8cef3e0..c1167b1 100644
--- a/TaikoLocalServer/TaikoLocalServer.csproj
+++ b/TaikoLocalServer/TaikoLocalServer.csproj
@@ -17,7 +17,7 @@
     <ItemGroup>
         <PackageReference Include="MediatR" Version="12.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.0-rc.1.23421.29" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-rc.2.23480.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.2.23480.1">
           <PrivateAssets>all</PrivateAssets>