Added some additional metrics