More comprehensive list of NIST components