Added a few more metrics