More metrics updates