Add count and comments