Adjusted ThreadComment to use CommentList