Added CommentBuffer class