Updated Metrics to v7