More metrics component work.