Update metrics to latest changes by NIST