Adding comment count as well