Added statistics to count more things