Updated Metrics to revision 7