Add a few more metrics