Added class CommentWidgets