Updated metrics output format