Improve metrics (27)