New version to handle comment_count in Comment