Updated statistics gathering