REV: comment support