Improve list-metrics