Add more metrics to Scrutinizer