Add support for new comments format