Expanded class hierarchy of Comment