Adding some more metrics