Improve stats reporting