Improve stats conversion