Added more metrics for admins to see