Added metric formatting