Added support for comment toggle features