More stats optimization