Add some more info for counting