Added new fields with counts