Added support for discussion comments