Updates to statistics handling