Add some more metrics