Updating for new metrics