Added more metrics