More metrics updates, splitting into InstanceMetrics and ClassMetrics