diff --git a/SCHALE.Common/Database/ModelExtensions/AccountExtensions.cs b/SCHALE.Common/Database/ModelExtensions/AccountExtensions.cs
index 0212b6b..8d940a9 100644
--- a/SCHALE.Common/Database/ModelExtensions/AccountExtensions.cs
+++ b/SCHALE.Common/Database/ModelExtensions/AccountExtensions.cs
@@ -46,7 +46,17 @@
             foreach (var item in items)
             {
                 item.AccountServerId = account.ServerId;
-                context.Items.Add(item);
+
+                var existingItem = account.Items.FirstOrDefault(x => x.UniqueId == item.UniqueId);
+
+                if (existingItem != null)
+                {
+                    existingItem.StackCount += item.StackCount;
+                    item.ServerId = existingItem.ServerId;
+                } else
+                    context.Items.Add(item);
+
+                context.SaveChanges();
             }
 
             return [.. items];
diff --git a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Shop.cs b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Shop.cs
index 2a5b6ae..ace1f2b 100644
--- a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Shop.cs
+++ b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Shop.cs
@@ -5,6 +5,7 @@ using SCHALE.Common.NetworkProtocol;
 using SCHALE.Common.Utils;
 using SCHALE.GameServer.Services;
 using SCHALE.GameServer.Utils;
+using Serilog;
 
 namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers
 {
@@ -242,72 +243,26 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers
                 }
             }
 
-            using var transaction = _context.Database.BeginTransaction();
+            account.AddCharacters(_context, [.. gachaList.Where(x => x.Character != null).Select(x => x.Character)]);
 
-            try
+            var acquiredItems = new List<ItemDB>();
+
+            acquiredItems = itemDict.Keys.Select(x => new ItemDB()
             {
-                // add characters
-                _context.Characters.AddRange(
-                    gachaList.Where(x => x.Character != null)
-                            .Select(x => x.Character)!);
+                IsNew = true,
+                UniqueId = x,
+                StackCount = itemDict[x],
+            }).ToList();
 
-                // create if item does not exist
-                foreach (var id in itemDict.Keys)
-                {
-                    var itemExists = _context.Items
-                        .Any(x => x.AccountServerId == account.ServerId && x.UniqueId == id);
-                    if (!itemExists)
-                    {
-                        _context.Items.Add(new ItemDB()
-                        {
-                            IsNew = true,
-                            UniqueId = id,
-                            StackCount = 0,
-                            AccountServerId = account.ServerId,
-                        });
-                    }
-                }
-                _context.SaveChanges();
-
-                // perform item count update
-                foreach (var (id, count) in itemDict)
-                {
-                    _context.Items
-                        .Where(x => x.AccountServerId == account.ServerId && x.UniqueId == id)
-                        .ExecuteUpdate(setters => setters.SetProperty(
-                            item => item.StackCount, item => item.StackCount + count));
-                }
-
-                _context.SaveChanges();
-
-                transaction.Commit();
-
-                _context.Entry(account).Collection(x => x.Items).Reload();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError("Transaction failed: {Message}", ex.Message);
-                throw;
-            }
-
-            var itemDbList = itemDict.Keys
-                .Select(id => _context.Items.AsNoTracking().First(x => x.AccountServerId == account.ServerId && x.UniqueId == id))
-                .ToList();
-            foreach (var gacha in gachaList)
-            {
-                if (gacha.Stone != null)
-                {
-                    gacha.Stone.ServerId = itemDbList.First(x => x.UniqueId == gacha.Stone.UniqueId).ServerId;
-                }
-            }
+            account.AddItems(_context, [.. acquiredItems]);
+            _context.SaveChanges();
 
             return new ShopBuyGacha3Response()
             {
                 GachaResults = gachaList,
-                UpdateTime = DateTime.UtcNow,
                 GemBonusRemain = int.MaxValue,
                 ConsumedItems = [],
-                AcquiredItems = itemDbList,
+                AcquiredItems = acquiredItems,
                 MissionProgressDBs = [],
             };
         }