Add support for adding comments