Add more metrics