Update Metrics to version 7