diff --git a/SoarCraft.AwaiShop.Test/SoarCraft.AwaiShop.Test.csproj b/SoarCraft.AwaiShop.Test/SoarCraft.AwaiShop.Test.csproj
index 98370dbd..9faf350e 100644
--- a/SoarCraft.AwaiShop.Test/SoarCraft.AwaiShop.Test.csproj
+++ b/SoarCraft.AwaiShop.Test/SoarCraft.AwaiShop.Test.csproj
@@ -11,13 +11,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="35.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.0" />
+    <PackageReference Include="Bogus" Version="35.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23577-04" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24080-01" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
diff --git a/SoarCraft.AwaiShop/Hub/Order/Post.cs b/SoarCraft.AwaiShop/Hub/Order/Post.cs
index 41358679..33fa7d75 100644
--- a/SoarCraft.AwaiShop/Hub/Order/Post.cs
+++ b/SoarCraft.AwaiShop/Hub/Order/Post.cs
@@ -13,7 +13,7 @@ internal partial class ShopHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
     [Authorize]
@@ -28,16 +28,14 @@ public async Task<uint> OrderPostNew(CartItem[] cart, string? cmt) {
         var order = (await this.Db.Orders.AddAsync(new() {
             UserId = this.UserId,
             Status = OrderStatus.Pending,
-            CreateAt = DateTime.UtcNow,
-            OrderCombos = new List<OrderCombo>(cart.Length),
-            Comments = new List<Comment>(1)
+            CreateAt = DateTime.UtcNow
         })).Entity;
 
         if (!string.IsNullOrWhiteSpace(cmt))
-            order.Comments.Add(new() {
+            await this.Db.Comments.AddAsync(new() {
                 Content = cmt,
                 CreateAt = DateTime.UtcNow,
-                Order = order,
+                Order = order
             });
 
         foreach (var item in cart) {
@@ -54,22 +52,23 @@ public async Task<uint> OrderPostNew(CartItem[] cart, string? cmt) {
                 )
                 .SingleAsync();
 
-            order.OrderCombos.Add(new() {
+            await this.Db.OrderCombos.AddAsync(new() {
                 Order = order,
                 Combo = combo,
-                Quantity = item.Quantity,
+                Quantity = item.Quantity
             });
         }
 
         return await this.Db.SaveChangesAsync() > 0
-            ? order.OrderId : throw new HubException();
+            ? order.OrderId
+            : throw new HubException();
     }
 
     /**
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
     [Authorize]
@@ -88,10 +87,10 @@ public async Task<bool> OrderPostAppend(uint orderId, string cmt) {
             .Where(x => x.Status != OrderStatus.Finished)
             .SingleAsync();
 
-        order.Comments.Add(new() {
+        await this.Db.Comments.AddAsync(new() {
             Content = cmt,
             CreateAt = DateTime.UtcNow,
-            Order = order,
+            Order = order
         });
 
         return await this.Db.SaveChangesAsync() > 0;
@@ -101,7 +100,7 @@ public async Task<bool> OrderPostAppend(uint orderId, string cmt) {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
     [Authorize]
@@ -121,12 +120,13 @@ public async Task<bool> OrderPostCancel(uint orderId, string reason) {
             .SingleAsync();
 
         order.Status = order.Status == OrderStatus.Shipping
-            ? OrderStatus.Returning : OrderStatus.Cancelled;
+            ? OrderStatus.Returning
+            : OrderStatus.Cancelled;
 
-        order.Comments.Add(new() {
+        await this.Db.Comments.AddAsync(new() {
             Content = "[User Cancel] " + reason,
             CreateAt = DateTime.UtcNow,
-            Order = order,
+            Order = order
         });
 
         return await this.Db.SaveChangesAsync() > 0;
@@ -136,7 +136,7 @@ public async Task<bool> OrderPostCancel(uint orderId, string reason) {
      * <remarks>
      * @author Aloento
      * @since 1.0.0
-     * @version 0.1.0
+     * @version 0.2.0
      * </remarks>
      */
     [Authorize]
@@ -148,10 +148,11 @@ public async Task<bool> OrderPostReceived(uint orderId) {
             .SingleAsync();
 
         order.Status = OrderStatus.Finished;
-        order.Comments.Add(new() {
+
+        await this.Db.Comments.AddAsync(new() {
             Content = "[User Mark Received Order]",
             CreateAt = DateTime.UtcNow,
-            Order = order,
+            Order = order
         });
 
         return await this.Db.SaveChangesAsync() > 0;