Start rework of metrics handling.