Added more metrics for admin to see