Added Unit and improved Statistics