Added adding of comments