Improve stats collection.