Index: ChapterX.Domain/Entities/AISuggestion.cs
===================================================================
--- ChapterX.Domain/Entities/AISuggestion.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/AISuggestion.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -13,4 +13,5 @@
         public string OriginalText { get; set; } = string.Empty;
         public string SuggestedText { get; set; } = string.Empty;
+        public string SuggestionType { get; set; } = string.Empty;
         public bool? Accepted { get; set; }
         public DateTime CreatedAt { get; set; }
@@ -19,5 +20,4 @@
         public int StoryId { get; set; }
         public Story Story { get; set; } = null!;
-        public ICollection<SuggestionType> SuggestionTypes { get; set; } = [];
         public ICollection<NeedApproval> NeedApprovals { get; set; } = [];
 
Index: ChapterX.Domain/Entities/Admin.cs
===================================================================
--- ChapterX.Domain/Entities/Admin.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/Admin.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -6,4 +6,5 @@
     {
         public int Id { get; set; } // maps to user_id
+        public DateTime AssignedAt { get; set; }
         public User User { get; set; } = null!;
     }
Index: ChapterX.Domain/Entities/Collaboration.cs
===================================================================
--- ChapterX.Domain/Entities/Collaboration.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/Collaboration.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -8,4 +8,6 @@
         public int UserId { get; set; }
         public int StoryId { get; set; }
+        public string Role { get; set; } = string.Empty;
+        public int? PermissionLevel { get; set; }
         public DateTime CreatedAt { get; set; }
         public User User { get; set; } = null!;
Index: ChapterX.Domain/Entities/ContentType.cs
===================================================================
--- ChapterX.Domain/Entities/ContentType.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ 	(revision )
@@ -1,12 +1,0 @@
-using ChapterX.Domain.Shared;
-
-namespace ChapterX.Domain.Entities
-{
-    public class ContentType : IEntity
-    {
-        public int Id { get; set; }
-        public int NotificationId { get; set; }
-        public string ContentTypeValue { get; set; } = string.Empty;
-        public Notification Notification { get; set; } = null!;
-    }
-}
Index: ChapterX.Domain/Entities/Likes.cs
===================================================================
--- ChapterX.Domain/Entities/Likes.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/Likes.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -8,5 +8,5 @@
         public int UserId { get; set; }
         public int StoryId { get; set; }
-        public DateTime CreatedAt { get; set; }
+        public DateTime LikedAt { get; set; }
         public User User { get; set; } = null!;
         public Story Story { get; set; } = null!;
Index: ChapterX.Domain/Entities/Notification.cs
===================================================================
--- ChapterX.Domain/Entities/Notification.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/Notification.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -12,13 +12,13 @@
         public int Id { get; set; }
         public string Content { get; set; } = string.Empty;
+        public string ContentType { get; set; } = string.Empty;
         public bool IsRead { get; set; }
+        public string? Link { get; set; }
         public DateTime CreatedAt { get; set; }
-        public int? RecipientUserId { get; set; }
-        public string? Type { get; set; }
-        public string? Link { get; set; }
 
-        public ICollection<ContentType> ContentTypes { get; set; } = [];
-        public ICollection<Notify> Notifies { get; set; } = [];
-
+        public int UserId { get; set; }
+        public int? StoryId { get; set; }
+        public User User { get; set; } = null!;
+        public Story? Story { get; set; }
     }
 }
Index: ChapterX.Domain/Entities/Notify.cs
===================================================================
--- ChapterX.Domain/Entities/Notify.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ 	(revision )
@@ -1,15 +1,0 @@
-using ChapterX.Domain.Shared;
-
-namespace ChapterX.Domain.Entities
-{
-    public class Notify : IEntity
-    {
-        public int Id { get; set; }
-        public int UserId { get; set; }
-        public int StoryId { get; set; }
-        public int NotificationId { get; set; }
-        public User User { get; set; } = null!;
-        public Story Story { get; set; } = null!;
-        public Notification Notification { get; set; } = null!;
-    }
-}
Index: ChapterX.Domain/Entities/PermissionLevel.cs
===================================================================
--- ChapterX.Domain/Entities/PermissionLevel.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ 	(revision )
@@ -1,12 +1,0 @@
-using ChapterX.Domain.Shared;
-
-namespace ChapterX.Domain.Entities
-{
-    public class PermissionLevel : IEntity
-    {
-        public int Id { get; set; }
-        public int UserId { get; set; }
-        public int StoryId { get; set; }
-        public int Level { get; set; }
-    }
-}
Index: ChapterX.Domain/Entities/RegularUser.cs
===================================================================
--- ChapterX.Domain/Entities/RegularUser.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/RegularUser.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -6,4 +6,5 @@
     {
         public int Id { get; set; } // maps to user_id
+        public DateTime JoinedAt { get; set; }
         public User User { get; set; } = null!;
     }
Index: ChapterX.Domain/Entities/Roles.cs
===================================================================
--- ChapterX.Domain/Entities/Roles.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ 	(revision )
@@ -1,12 +1,0 @@
-using ChapterX.Domain.Shared;
-
-namespace ChapterX.Domain.Entities
-{
-    public class Roles : IEntity
-    {
-        public int Id { get; set; }
-        public int UserId { get; set; }
-        public int StoryId { get; set; }
-        public string RoleValue { get; set; } = string.Empty;
-    }
-}
Index: ChapterX.Domain/Entities/Status.cs
===================================================================
--- ChapterX.Domain/Entities/Status.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ 	(revision )
@@ -1,12 +1,0 @@
-using ChapterX.Domain.Shared;
-
-namespace ChapterX.Domain.Entities
-{
-    public class Status : IEntity
-    {
-        public int Id { get; set; }
-        public int StoryId { get; set; }
-        public string StatusValue { get; set; } = string.Empty;
-        public Story Story { get; set; } = null!;
-    }
-}
Index: ChapterX.Domain/Entities/Story.cs
===================================================================
--- ChapterX.Domain/Entities/Story.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/Story.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -16,4 +16,5 @@
         public string? Image { get; set; }
         public string Content { get; set; } = string.Empty;
+        public string Status { get; set; } = "draft";
         public DateTime CreatedAt { get; set; }
         public DateTime UpdatedAt { get; set; }
@@ -21,5 +22,4 @@
         public int UserId { get; set; }
         public Writer Writer { get; set; } = null!;
-        public ICollection<Status> Statuses { get; set; } = [];
         public ICollection<Chapter> Chapters { get; set; } = [];
         public ICollection<HasGenre> HasGenres { get; set; } = [];
@@ -28,5 +28,5 @@
         public ICollection<Collaboration> Collaborations { get; set; } = [];
         public ICollection<AISuggestion> AISuggestions { get; set; } = [];
-        public ICollection<Notify> Notifies { get; set; } = [];
+        public ICollection<Notification> Notifications { get; set; } = [];
         public ICollection<ReadingListItems> ReadingListItems { get; set; } = [];
         public ICollection<NeedApproval> NeedApprovals { get; set; } = [];
Index: ChapterX.Domain/Entities/SuggestionType.cs
===================================================================
--- ChapterX.Domain/Entities/SuggestionType.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ 	(revision )
@@ -1,12 +1,0 @@
-using ChapterX.Domain.Shared;
-
-namespace ChapterX.Domain.Entities
-{
-    public class SuggestionType : IEntity
-    {
-        public int Id { get; set; }
-        public int SuggestionId { get; set; }
-        public string SuggestionTypeValue { get; set; } = string.Empty;
-        public AISuggestion AISuggestion { get; set; } = null!;
-    }
-}
Index: ChapterX.Domain/Entities/User.cs
===================================================================
--- ChapterX.Domain/Entities/User.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/User.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -26,5 +26,5 @@
         public ICollection<Comment> Comments { get; set; } = [];
         public ICollection<Collaboration> Collaborations { get; set; } = [];
-        public ICollection<Notify> Notifies { get; set; } = [];
+        public ICollection<Notification> Notifications { get; set; } = [];
 
 
Index: ChapterX.Domain/Entities/Writer.cs
===================================================================
--- ChapterX.Domain/Entities/Writer.cs	(revision 99c1e45f4ac45a164229bc6f60f3b05bc26df047)
+++ ChapterX.Domain/Entities/Writer.cs	(revision e882b92860e1899312f197af1134bb0f33d30d15)
@@ -6,4 +6,5 @@
     {
         public int Id { get; set; } // maps to user_id
+        public string? Bio { get; set; }
         public User User { get; set; } = null!;
         public ICollection<Story> Stories { get; set; } = [];