Collect more metrics