diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
index 43b1713506..568e136591 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContextExtensions.cs
@@ -1,6 +1,9 @@
 using System;
 using Volo.Abp;
 using Volo.Abp.MongoDB;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.MongoDB
 {
@@ -17,6 +20,21 @@ namespace Volo.CmsKit.MongoDB
             );
 
             optionsAction?.Invoke(options);
+
+            builder.Entity<CmsUser>(x =>
+            {
+                x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Users";
+            });
+
+            builder.Entity<UserReaction>(x =>
+            {
+                x.CollectionName = CmsKitDbProperties.DbTablePrefix + "UserReactions";
+            });
+
+            builder.Entity<Comment>(x =>
+            {
+                x.CollectionName = CmsKitDbProperties.DbTablePrefix + "Comments";
+            });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
index a779111e57..9564bcf9f8 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
@@ -59,14 +59,16 @@ namespace Volo.CmsKit.MongoDB.Comments
 
             foreach (var reply in replies)
             {
-                //TODO: Discuss if it is better to mark it as deleted and show in the ui as "This is deleted" instead of deleting it and replies completely
                 await base.DeleteAsync(
                     reply,
                     cancellationToken: GetCancellationToken(cancellationToken)
                 );
             }
 
-            await base.DeleteAsync(comment, cancellationToken: GetCancellationToken(cancellationToken));
+            await base.DeleteAsync(
+                comment,
+                cancellationToken: GetCancellationToken(cancellationToken)
+            );
         }
     }
 }