Add support for comment