Added some metrics