Implement handling of comments