Add with_comments mode