Now taking type into account when generating the stats