More metrics data machinery