Changes to read NIST database