Added support for counting comments