Removed CommentListModel, changed CommentModel to a single type