Added the count to the mapper