Statistics collection now works (hopefully the right way :)