diff --git a/.gitignore b/.gitignore
index f5bd8b39..6e1f4a12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ test/oqs_test_groups
 # test artifacts
 tmp
 interop.log
+# pycache
+oqs-template/__pycache__
diff --git a/oqs-template/generate.py b/oqs-template/generate.py
index 929163c2..584ba55d 100644
--- a/oqs-template/generate.py
+++ b/oqs-template/generate.py
@@ -215,4 +215,5 @@ def load_config(include_disabled_sigs=False):
 populate('ALGORITHMS.md', config2, '<!---')
 populate('README.md', config2, '<!---')
 print("All files generated")
-
+os.environ["LIBOQS_DOCS_DIR"]=os.path.join(os.environ["LIBOQS_SRC_DIR"], "docs")
+import generate_oid_nid_table
diff --git a/oqs-template/generate_oid_nid_table.py b/oqs-template/generate_oid_nid_table.py
new file mode 100644
index 00000000..24a0ac24
--- /dev/null
+++ b/oqs-template/generate_oid_nid_table.py
@@ -0,0 +1,165 @@
+#!/usr/bin/env python3
+
+import argparse
+import sys
+from tabulate import tabulate
+import yaml
+import os
+
+import generatehelpers
+
+config = {}
+
+def gen_sig_table(oqslibdocdir):
+  liboqs_sig_docs_dir = os.path.join(oqslibdocdir, 'algorithms', 'sig')
+  liboqs_sigs = {}
+  for root, _, files in os.walk(liboqs_sig_docs_dir):
+    for fil in files:
+      if fil.endswith(".yml"):
+        with open(os.path.join(root, fil), mode='r', encoding='utf-8') as f:
+           algyml = yaml.safe_load(f.read())
+        liboqs_sigs[algyml['name']]=algyml
+
+  table = [['Algorithm', 'Implementation Version',
+          'NIST round', 'Claimed NIST Level', 'Code Point', 'OID']]
+  claimed_nist_level = 0
+  for sig in sorted(config['sigs'], key=lambda s: s['family']):
+    for variant in sig['variants']:
+        if variant['security'] == 128:
+            claimed_nist_level = 1
+        elif variant['security'] == 192:
+            claimed_nist_level = 3
+        elif variant['security'] == 256:
+            claimed_nist_level = 5
+        else:
+            sys.exit("variant['security'] value malformed.")
+
+        if sig['family'].startswith('SPHINCS'):
+            sig['family'] = 'SPHINCS+'
+
+        if variant['name'].startswith('dilithium2'):
+            claimed_nist_level = 2
+
+        try: 
+            table.append([variant['name'], liboqs_sigs[sig['family']]['spec-version'],
+                          liboqs_sigs[sig['family']]['nist-round'], claimed_nist_level, variant['code_point'],
+                          variant['oid']])
+            for hybrid in variant['mix_with']:
+                table.append([variant['name'] + ' **hybrid with** ' + hybrid['name'],
+                              liboqs_sigs[sig['family']]['spec-version'],
+                              liboqs_sigs[sig['family']]['nist-round'],
+                              claimed_nist_level,
+                              hybrid['code_point'],
+                              hybrid['oid']])
+        except KeyError as ke:
+            # Non-existant NIDs mean this alg is not supported any more
+            pass
+
+        if 'extra_nids' in variant:
+          for i in range(len(variant['extra_nids']['old'])):
+            table.append([variant['name'], variant['extra_nids']['old'][i]['implementation_version'],
+                          variant['extra_nids']['old'][i]['nist-round'], claimed_nist_level, variant['extra_nids']['old'][i]['code_point'],
+                          variant['extra_nids']['old'][i]['oid']])
+            for hybrid in variant['extra_nids']['old'][i]['mix_with']:
+                table.append([variant['name'] + ' **hybrid with** ' + hybrid['name'],
+                              variant['extra_nids']['old'][i]['implementation_version'],
+                              variant['extra_nids']['old'][i]['nist-round'],
+                              claimed_nist_level,
+                              hybrid['code_point'],
+                              hybrid['oid']])
+
+  with open(os.path.join('oqs-template', 'oqs-sig-info.md'), mode='w', encoding='utf-8') as f:
+    f.write(tabulate(table, tablefmt="pipe", headers="firstrow"))
+  print("Written oqs-sig-info.md")
+
+def gen_kem_table(oqslibdocdir):
+  liboqs_kem_docs_dir = os.path.join(oqslibdocdir, 'algorithms', 'kem')
+  liboqs_kems = {}
+  for root, _, files in os.walk(liboqs_kem_docs_dir):
+    for fil in files:
+      if fil.endswith(".yml"):
+        with open(os.path.join(root, fil), mode='r', encoding='utf-8') as f:
+           algyml = yaml.safe_load(f.read())
+        liboqs_kems[algyml['name']]=algyml
+  if 'SIKE' in liboqs_kems:
+      liboqs_kems['SIDH']=liboqs_kems['SIKE']
+  # TODO: Workaround for wrong upstream name for Kyber:
+  liboqs_kems['CRYSTALS-Kyber']=liboqs_kems['Kyber']
+
+  table_header = ['Family', 'Implementation Version', 'Variant', 'NIST round', 'Claimed NIST Level',
+           'Code Point', 'Hybrid Elliptic Curve (if any)']
+  table = []
+  hybrid_elliptic_curve = ''
+  for kem in sorted(config['kems'], key=lambda k: k['family']):
+    if kem['bit_security'] == 128:
+        claimed_nist_level = 1
+        hybrid_elliptic_curve = 'secp256_r1'
+    elif kem['bit_security'] == 192:
+        claimed_nist_level = 3
+        hybrid_elliptic_curve = 'secp384_r1'
+    elif kem['bit_security'] == 256:
+        claimed_nist_level = 5
+        hybrid_elliptic_curve = 'secp521_r1'
+    else:
+        sys.exit("kem['bit_security'] value malformed.")
+        
+    if 'implementation_version' in kem:
+        implementation_version = kem['implementation_version']
+    else:
+        if kem['family'] in liboqs_kems:
+            implementation_version = liboqs_kems[kem['family']]['spec-version']
+
+    if kem['name_group'].startswith('sidhp503') or kem['name_group'].startswith('sikep503'):
+        claimed_nist_level = 2
+
+    try: 
+       table.append([kem['family'], implementation_version,
+                     kem['name_group'], liboqs_kems[kem['family']]['nist-round'], claimed_nist_level,
+                     kem['nid'], ""])
+       table.append([kem['family'], implementation_version,
+                     kem['name_group'], liboqs_kems[kem['family']]['nist-round'], claimed_nist_level,
+                     kem['nid_hybrid'], hybrid_elliptic_curve])
+    except KeyError as ke:
+       # Non-existant NIDs mean this alg is not supported any more
+       pass
+
+    if 'extra_nids' in kem:
+        if 'current' in kem['extra_nids']: # assume "current" NIDs to mean liboqs-driven NIST round information:
+            for entry in kem['extra_nids']['current']:
+                table.append([kem['family'], implementation_version,
+                              kem['name_group'], liboqs_kems[kem['family']]['nist-round'], claimed_nist_level,
+                              entry['nid'], 
+                              entry['hybrid_group'] if 'hybrid_group' in entry else ""])
+        if 'old' in kem['extra_nids']:
+            for entry in kem['extra_nids']['old']:
+                table.append([kem['family'], entry['implementation_version'],
+                              kem['name_group'], entry['nist-round'], claimed_nist_level,
+                              entry['nid'],
+                              entry['hybrid_group'] if 'hybrid_group' in entry else ""])
+
+  # sort by:  family, version, security level, variant, hybrid
+  table.sort(key = lambda row: "{:s}|{:s}|{:d}|{:s}|{:s}".format(row[0], row[1], row[3], row[2], row[5]))
+
+  table = [table_header] + table
+
+  with open(os.path.join('oqs-template', 'oqs-kem-info.md'), mode='w', encoding='utf-8') as f:
+    f.write(tabulate(table, tablefmt="pipe", headers="firstrow"))
+    f.write("\n")
+  print("Written oqs-kem-info.md")
+
+# main:
+with open(os.path.join('oqs-template', 'generate.yml'), mode='r', encoding='utf-8') as f:
+    config = yaml.safe_load(f.read())
+
+if 'LIBOQS_DOCS_DIR' not in os.environ:
+   parser = argparse.ArgumentParser()
+   parser.add_argument('--liboqs-docs-dir', dest="liboqs_docs_dir", required=True)
+   args = parser.parse_args()
+   oqsdocsdir = args.liboqs_docs_dir
+else:
+   oqsdocsdir = os.environ["LIBOQS_DOCS_DIR"]
+
+config = generatehelpers.complete_config(config, oqsdocsdir)
+
+gen_kem_table(oqsdocsdir)
+gen_sig_table(oqsdocsdir)
diff --git a/oqs-template/generatehelpers.py b/oqs-template/generatehelpers.py
new file mode 100644
index 00000000..8da3eff0
--- /dev/null
+++ b/oqs-template/generatehelpers.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+
+import copy
+import glob
+import jinja2
+import jinja2.ext
+import os
+import shutil
+import subprocess
+import yaml
+import json
+import sys
+
+def file_get_contents(filename, encoding=None):
+    with open(filename, mode='r', encoding=encoding) as fh:
+        return fh.read()
+
+def file_put_contents(filename, s, encoding=None):
+    with open(filename, mode='w', encoding=encoding) as fh:
+        fh.write(s)
+
+def get_kem_nistlevel(alg, docsdir):
+    # translate family names in generate.yml to directory names for liboqs algorithm datasheets
+    if alg['family'] == 'CRYSTALS-Kyber': datasheetname = 'kyber'
+    elif alg['family'] == 'SIDH': datasheetname = 'sike'
+    elif alg['family'] == 'NTRU-Prime': datasheetname = 'ntruprime'
+    else: datasheetname = alg['family'].lower()
+    # load datasheet
+    try:
+        algymlfilename = os.path.join(docsdir, 'algorithms', 'kem', '{:s}.yml'.format(datasheetname))
+        algyml = yaml.safe_load(file_get_contents(algymlfilename, encoding='utf-8'))
+    except: # check alternate location in "oldalgs" folder
+        algymlfilename = os.path.join("oqs-template", 'oldalgdocs', 'kem', '{:s}.yml'.format(datasheetname))
+        algyml = yaml.safe_load(file_get_contents(algymlfilename, encoding='utf-8'))
+
+    # hacks to match names
+    def matches(name, alg):
+        def simplify(s):
+            return s.lower().replace('_', '').replace('-', '')
+        if 'FrodoKEM' in name: name = name.replace('FrodoKEM', 'Frodo')
+        if 'Saber-KEM' in name: name = name.replace('-KEM', '')
+        if '-90s' in name: name = name.replace('-90s', '').replace('Kyber', 'Kyber90s')
+        if simplify(name) == simplify(alg['name_group']): return True
+        return False
+    # find the variant that matches
+    for variant in algyml['parameter-sets']:
+        if matches(variant['name'], alg):
+            return variant['claimed-nist-level']
+    # Information file for algorithms no longer supported by liboqs:
+    oldalgs = yaml.safe_load(file_get_contents(os.path.join("oqs-template", "oldalgs.yml"), encoding='utf-8'))
+    name = alg['name_group']
+    if name in oldalgs:
+        return oldalgs[name]['claimed-nist-level']
+    return None
+
+def get_sig_nistlevel(family, alg, docsdir):
+    # translate family names in generate.yml to directory names for liboqs algorithm datasheets
+    if family['family'] == 'CRYSTALS-Dilithium': datasheetname = 'dilithium'
+    elif family['family'] == 'SPHINCS-Haraka': datasheetname = 'sphincs'
+    elif family['family'] == 'SPHINCS-SHA256': datasheetname = 'sphincs'
+    elif family['family'] == 'SPHINCS-SHAKE256': datasheetname = 'sphincs'
+    elif family['family'] == 'SPHINCS-SHA2': datasheetname = 'sphincs'
+    elif family['family'] == 'SPHINCS-SHAKE': datasheetname = 'sphincs'
+    else: datasheetname = family['family'].lower()
+    # load datasheet
+    algymlfilename = os.path.join(docsdir, 'algorithms', 'sig', '{:s}.yml'.format(datasheetname))
+    algyml = yaml.safe_load(file_get_contents(algymlfilename, encoding='utf-8'))
+    # hacks to match names
+    def matches(name, alg):
+        def simplify(s):
+            return s.lower().replace('_', '').replace('-', '').replace('+', '')
+        if simplify(name) == simplify(alg['name']): return True
+        return False
+    # find the variant that matches
+    for variant in algyml['parameter-sets']:
+        if matches(variant['name'], alg):
+            return variant['claimed-nist-level']
+    # Information file for algorithms no longer supported by liboqs:
+    oldalgs = yaml.safe_load(file_get_contents(os.path.join("oqs-template", "oldalgs.yml"), encoding='utf-8'))
+    name = alg['name']
+    if name in oldalgs:
+        return oldalgs[name]['claimed-nist-level']
+    return None
+
+def nist_to_bits(nistlevel):
+   if nistlevel==1 or nistlevel==2:
+      return 128
+   elif nistlevel==3 or nistlevel==4:
+      return 192
+   elif nistlevel==5:
+      return 256
+   else: 
+      return None
+
+def complete_config(config, oqsdocsdir = None):
+   if oqsdocsdir == None:
+      if 'LIBOQS_DOCS_DIR' not in os.environ:
+        print("Must include LIBOQS_DOCS_DIR in environment")
+        exit(1)
+      oqsdocsdir = os.environ["LIBOQS_DOCS_DIR"]
+   for kem in config['kems']:
+      if not "bit_security" in kem.keys():
+         bits_level = nist_to_bits(get_kem_nistlevel(kem, oqsdocsdir))
+         if bits_level == None: 
+             print("Cannot find security level for {:s} {:s}".format(kem['family'], kem['name_group']))
+             exit(1)
+         kem['bit_security'] = bits_level
+   for famsig in config['sigs']:
+      for sig in famsig['variants']:
+         if not "security" in sig.keys():
+            bits_level = nist_to_bits(get_sig_nistlevel(famsig, sig, oqsdocsdir))
+            if bits_level == None: 
+                if sig['name'].startswith("rainbowI"):
+                    bits_level=128
+                else:
+                    print("Cannot find security level for {:s} {:s}".format(famsig['family'], sig['name']))
+                    exit(1)
+            sig['security'] = bits_level
+   return config
+
diff --git a/oqs-template/oldalgdocs/kem/sike.yml b/oqs-template/oldalgdocs/kem/sike.yml
new file mode 100644
index 00000000..e1444c8a
--- /dev/null
+++ b/oqs-template/oldalgdocs/kem/sike.yml
@@ -0,0 +1,1066 @@
+name: SIKE
+type: kem
+principal-submitters:
+- David Jao
+- Reza Azarderakhsh
+- Matthew Campagna
+- Craig Costello
+- Luca De Feo
+- Basil Hess
+- Amir Jalali
+- Brian Koziel
+- Brian LaMacchia
+- Patrick Longa
+- Michael Naehrig
+- Joost Renes
+- Vladimir Soukharev
+- David Urbanik
+crypto-assumption: (supersingular) isogeny walk problem
+website: https://sike.org
+nist-round: 3
+spec-version: NIST Round 3 submission
+spdx-license-identifier: MIT
+primary-upstream:
+  source: https://github.com/microsoft/PQCrypto-SIDH/commit/effa607f244768cdd38f930887076373604eaa78
+  spdx-license-identifier: MIT
+parameter-sets:
+- name: SIDH-p434
+  claimed-nist-level: 1
+  claimed-security: IND-CPA
+  length-public-key: 330
+  length-ciphertext: 330
+  length-secret-key: 28
+  length-shared-secret: 110
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIDH-p434-compressed
+  claimed-nist-level: 1
+  claimed-security: IND-CPA
+  length-public-key: 197
+  length-ciphertext: 197
+  length-secret-key: 28
+  length-shared-secret: 110
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIDH-p503
+  claimed-nist-level: 2
+  claimed-security: IND-CPA
+  length-public-key: 378
+  length-ciphertext: 378
+  length-secret-key: 32
+  length-shared-secret: 126
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIDH-p503-compressed
+  claimed-nist-level: 2
+  claimed-security: IND-CPA
+  length-public-key: 225
+  length-ciphertext: 225
+  length-secret-key: 32
+  length-shared-secret: 126
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIDH-p610
+  claimed-nist-level: 3
+  claimed-security: IND-CPA
+  length-public-key: 462
+  length-ciphertext: 462
+  length-secret-key: 39
+  length-shared-secret: 154
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIDH-p610-compressed
+  claimed-nist-level: 3
+  claimed-security: IND-CPA
+  length-public-key: 274
+  length-ciphertext: 274
+  length-secret-key: 39
+  length-shared-secret: 154
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIDH-p751
+  claimed-nist-level: 5
+  claimed-security: IND-CPA
+  length-public-key: 564
+  length-ciphertext: 564
+  length-secret-key: 48
+  length-shared-secret: 188
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIDH-p751-compressed
+  claimed-nist-level: 5
+  claimed-security: IND-CPA
+  length-public-key: 335
+  length-ciphertext: 335
+  length-secret-key: 48
+  length-shared-secret: 188
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p434
+  claimed-nist-level: 1
+  claimed-security: IND-CCA2
+  length-public-key: 330
+  length-ciphertext: 346
+  length-secret-key: 374
+  length-shared-secret: 16
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p434-compressed
+  claimed-nist-level: 1
+  claimed-security: IND-CCA2
+  length-public-key: 197
+  length-ciphertext: 236
+  length-secret-key: 350
+  length-shared-secret: 16
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p503
+  claimed-nist-level: 2
+  claimed-security: IND-CCA2
+  length-public-key: 378
+  length-ciphertext: 402
+  length-secret-key: 434
+  length-shared-secret: 24
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p503-compressed
+  claimed-nist-level: 2
+  claimed-security: IND-CCA2
+  length-public-key: 225
+  length-ciphertext: 280
+  length-secret-key: 407
+  length-shared-secret: 24
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p610
+  claimed-nist-level: 3
+  claimed-security: IND-CCA2
+  length-public-key: 462
+  length-ciphertext: 486
+  length-secret-key: 524
+  length-shared-secret: 24
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p610-compressed
+  claimed-nist-level: 3
+  claimed-security: IND-CCA2
+  length-public-key: 274
+  length-ciphertext: 336
+  length-secret-key: 491
+  length-shared-secret: 24
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p751
+  claimed-nist-level: 5
+  claimed-security: IND-CCA2
+  length-public-key: 564
+  length-ciphertext: 596
+  length-secret-key: 644
+  length-shared-secret: 32
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+- name: SIKE-p751-compressed
+  claimed-nist-level: 5
+  claimed-security: IND-CCA2
+  length-public-key: 335
+  length-ciphertext: 410
+  length-secret-key: 602
+  length-shared-secret: 32
+  implementations-switch-on-runtime-cpu-features: false
+  implementations:
+  - upstream: primary-upstream
+    upstream-id: optimized
+    supported-platforms: all
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_bmi2
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_amd64_adx
+    supported-platforms:
+    - architecture: x86_64
+      operating_systems:
+      - Linux
+      - Darwin
+      required_flags:
+      - bmi2
+      - adx
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
+  - upstream: primary-upstream
+    upstream-id: additional_arm64
+    supported-platforms:
+    - architecture: arm64v8
+      operating_systems:
+      - Linux
+      - Darwin
+      - FreeBSD
+    common-crypto:
+    - SHA3: liboqs
+    no-secret-dependent-branching-claimed: true
+    no-secret-dependent-branching-checked-by-valgrind: true
+    large-stack-usage: false
diff --git a/oqs-template/oldalgs.yml b/oqs-template/oldalgs.yml
new file mode 100644
index 00000000..16e3115c
--- /dev/null
+++ b/oqs-template/oldalgs.yml
@@ -0,0 +1,62 @@
+kyber90s512:
+   claimed-nist-level: 1
+kyber90s768:
+   claimed-nist-level: 3
+kyber90s1024:
+   claimed-nist-level: 5
+dilithium2_aes:
+   claimed-nist-level: 2
+dilithium3_aes:
+   claimed-nist-level: 3
+dilithium5_aes:
+   claimed-nist-level: 5
+sphincsharaka128frobust:
+   claimed-nist-level: 1
+sphincsshake256128frobust:
+   claimed-nist-level: 1
+sphincsshake256128srobust:
+   claimed-nist-level: 1
+sphincsharaka128fsimple:
+   claimed-nist-level: 1
+sphincsharaka128srobust:
+   claimed-nist-level: 1
+sphincsharaka128ssimple:
+   claimed-nist-level: 1
+sphincsharaka192frobust:
+   claimed-nist-level: 3
+sphincsharaka192fsimple:
+   claimed-nist-level: 3
+sphincsharaka192srobust:
+   claimed-nist-level: 3
+sphincsharaka192ssimple:
+   claimed-nist-level: 3
+sphincsshake256192frobust:
+   claimed-nist-level: 3
+sphincsshake256192srobust:
+   claimed-nist-level: 3
+sphincsharaka256frobust:
+   claimed-nist-level: 3
+sphincsharaka256fsimple:
+   claimed-nist-level: 5
+sphincsharaka256srobust:
+   claimed-nist-level: 5
+sphincsharaka256ssimple:
+   claimed-nist-level: 5
+sphincssha26128frobust:
+   claimed-nist-level: 5
+sphincssha256128srobust:
+   claimed-nist-level: 5
+sphincssha256192frobust:
+   claimed-nist-level: 5
+sphincssha256192srobust:
+   claimed-nist-level: 5
+sphincssha256256frobust:
+   claimed-nist-level: 5
+sphincssha256256srobust:
+   claimed-nist-level: 5
+sphincsshake256256frobust:
+   claimed-nist-level: 5
+sphincsshake256256srobust:
+   claimed-nist-level: 5
+
+
diff --git a/oqs-template/oqs-kem-info.md b/oqs-template/oqs-kem-info.md
new file mode 100644
index 00000000..67671fc7
--- /dev/null
+++ b/oqs-template/oqs-kem-info.md
@@ -0,0 +1,77 @@
+| Family         | Implementation Version   | Variant        |   NIST round |   Claimed NIST Level | Code Point   | Hybrid Elliptic Curve (if any)   |
+|:---------------|:-------------------------|:---------------|-------------:|---------------------:|:-------------|:---------------------------------|
+| BIKE           | 5.1                      | bikel1         |            4 |                    1 | 0x0241       |                                  |
+| BIKE           | 5.1                      | bikel1         |            4 |                    1 | 0x2F41       | secp256_r1                       |
+| BIKE           | 5.1                      | bikel1         |            4 |                    1 | 0x2FAE       | x25519                           |
+| BIKE           | 5.1                      | bikel3         |            4 |                    3 | 0x0242       |                                  |
+| BIKE           | 5.1                      | bikel3         |            4 |                    3 | 0x2F42       | secp384_r1                       |
+| BIKE           | 5.1                      | bikel3         |            4 |                    3 | 0x2FAF       | x448                             |
+| BIKE           | 5.1                      | bikel5         |            4 |                    5 | 0x0243       |                                  |
+| BIKE           | 5.1                      | bikel5         |            4 |                    5 | 0x2F43       | secp521_r1                       |
+| BIKE           | NIST Round 2 submission  | bike1l1cpa     |            2 |                    1 | 0x0206       |                                  |
+| BIKE           | NIST Round 2 submission  | bike1l1cpa     |            2 |                    1 | 0x2F06       | secp256_r1                       |
+| BIKE           | NIST Round 2 submission  | bike1l1fo      |            2 |                    1 | 0x0223       |                                  |
+| BIKE           | NIST Round 2 submission  | bike1l1fo      |            2 |                    1 | 0x2F23       | secp256_r1                       |
+| BIKE           | NIST Round 2 submission  | bike1l1fo      |            2 |                    1 | 0x2F28       | x25519                           |
+| BIKE           | NIST Round 2 submission  | bike1l3cpa     |            2 |                    3 | 0x0207       |                                  |
+| BIKE           | NIST Round 2 submission  | bike1l3cpa     |            2 |                    3 | 0x2F07       | secp384_r1                       |
+| BIKE           | NIST Round 2 submission  | bike1l3fo      |            2 |                    3 | 0x0224       |                                  |
+| BIKE           | NIST Round 2 submission  | bike1l3fo      |            2 |                    3 | 0x2F24       | secp384_r1                       |
+| BIKE           | NIST Round 3 submission  | bikel1         |            3 |                    1 | 0x0238       |                                  |
+| BIKE           | NIST Round 3 submission  | bikel1         |            3 |                    1 | 0x2F37       | x25519                           |
+| BIKE           | NIST Round 3 submission  | bikel1         |            3 |                    1 | 0x2F38       | secp256_r1                       |
+| BIKE           | NIST Round 3 submission  | bikel3         |            3 |                    3 | 0x023B       |                                  |
+| BIKE           | NIST Round 3 submission  | bikel3         |            3 |                    3 | 0x2F3B       | secp384_r1                       |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber1024      |            2 |                    5 | 0x0211       |                                  |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber1024      |            2 |                    5 | 0x2F11       | secp521_r1                       |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber512       |            2 |                    1 | 0x020F       |                                  |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber512       |            2 |                    1 | 0x2F0F       | secp256_r1                       |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber512       |            2 |                    1 | 0x2F26       | x25519                           |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber768       |            2 |                    3 | 0x0210       |                                  |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber768       |            2 |                    3 | 0x2F10       | secp384_r1                       |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber90s1024   |            2 |                    5 | 0x022B       |                                  |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber90s1024   |            2 |                    5 | 0x2F2B       | secp521_r1                       |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber90s512    |            2 |                    1 | 0x0229       |                                  |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber90s512    |            2 |                    1 | 0x2F29       | secp256_r1                       |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber90s768    |            2 |                    3 | 0x022A       |                                  |
+| CRYSTALS-Kyber | NIST Round 2 submission  | kyber90s768    |            2 |                    3 | 0x2F2A       | secp384_r1                       |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber1024      |            3 |                    5 | 0x023D       |                                  |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber1024      |            3 |                    5 | 0x2F3D       | secp521_r1                       |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber512       |            3 |                    1 | 0x023A       |                                  |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber512       |            3 |                    1 | 0x2F39       | x25519                           |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber512       |            3 |                    1 | 0x2F3A       | secp256_r1                       |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber768       |            3 |                    3 | 0x023C       |                                  |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber768       |            3 |                    3 | 0x2F3C       | secp384_r1                       |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber768       |            3 |                    3 | 0x2F90       | x448                             |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s1024   |            3 |                    5 | 0x0240       |                                  |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s1024   |            3 |                    5 | 0x2F40       | secp521_r1                       |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s512    |            3 |                    1 | 0x023E       |                                  |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s512    |            3 |                    1 | 0x2F3E       | secp256_r1                       |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s512    |            3 |                    1 | 0x2FA9       | x25519                           |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s768    |            3 |                    3 | 0x023F       |                                  |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s768    |            3 |                    3 | 0x2F3F       | secp384_r1                       |
+| CRYSTALS-Kyber | NIST Round 3 submission  | kyber90s768    |            3 |                    3 | 0x2FAA       | x448                             |
+| FrodoKEM       | NIST Round 3 submission  | frodo1344aes   |            3 |                    5 | 0x0204       |                                  |
+| FrodoKEM       | NIST Round 3 submission  | frodo1344aes   |            3 |                    5 | 0x2F04       | secp521_r1                       |
+| FrodoKEM       | NIST Round 3 submission  | frodo1344shake |            3 |                    5 | 0x0205       |                                  |
+| FrodoKEM       | NIST Round 3 submission  | frodo1344shake |            3 |                    5 | 0x2F05       | secp521_r1                       |
+| FrodoKEM       | NIST Round 3 submission  | frodo640aes    |            3 |                    1 | 0x0200       |                                  |
+| FrodoKEM       | NIST Round 3 submission  | frodo640aes    |            3 |                    1 | 0x2F00       | secp256_r1                       |
+| FrodoKEM       | NIST Round 3 submission  | frodo640aes    |            3 |                    1 | 0x2F80       | x25519                           |
+| FrodoKEM       | NIST Round 3 submission  | frodo640shake  |            3 |                    1 | 0x0201       |                                  |
+| FrodoKEM       | NIST Round 3 submission  | frodo640shake  |            3 |                    1 | 0x2F01       | secp256_r1                       |
+| FrodoKEM       | NIST Round 3 submission  | frodo640shake  |            3 |                    1 | 0x2F81       | x25519                           |
+| FrodoKEM       | NIST Round 3 submission  | frodo976aes    |            3 |                    3 | 0x0202       |                                  |
+| FrodoKEM       | NIST Round 3 submission  | frodo976aes    |            3 |                    3 | 0x2F02       | secp384_r1                       |
+| FrodoKEM       | NIST Round 3 submission  | frodo976aes    |            3 |                    3 | 0x2F82       | x448                             |
+| FrodoKEM       | NIST Round 3 submission  | frodo976shake  |            3 |                    3 | 0x0203       |                                  |
+| FrodoKEM       | NIST Round 3 submission  | frodo976shake  |            3 |                    3 | 0x2F03       | secp384_r1                       |
+| FrodoKEM       | NIST Round 3 submission  | frodo976shake  |            3 |                    3 | 0x2F83       | x448                             |
+| HQC            | NIST Round 3 submission  | hqc128         |            3 |                    1 | 0x022C       |                                  |
+| HQC            | NIST Round 3 submission  | hqc128         |            3 |                    1 | 0x2F2C       | secp256_r1                       |
+| HQC            | NIST Round 3 submission  | hqc128         |            3 |                    1 | 0x2FAC       | x25519                           |
+| HQC            | NIST Round 3 submission  | hqc192         |            3 |                    3 | 0x022D       |                                  |
+| HQC            | NIST Round 3 submission  | hqc192         |            3 |                    3 | 0x2F2D       | secp384_r1                       |
+| HQC            | NIST Round 3 submission  | hqc192         |            3 |                    3 | 0x2FAD       | x448                             |
+| HQC            | NIST Round 3 submission  | hqc256         |            3 |                    5 | 0x022E       |                                  |
+| HQC            | NIST Round 3 submission  | hqc256         |            3 |                    5 | 0x2F2E       | secp521_r1                       |
diff --git a/oqs-template/oqs-sig-info.md b/oqs-template/oqs-sig-info.md
new file mode 100644
index 00000000..9f084982
--- /dev/null
+++ b/oqs-template/oqs-sig-info.md
@@ -0,0 +1,138 @@
+| Algorithm                                         | Implementation Version                        |   NIST round |   Claimed NIST Level | Code Point   | OID                      |
+|:--------------------------------------------------|:----------------------------------------------|-------------:|---------------------:|:-------------|:-------------------------|
+| dilithium2                                        | 3.1                                           |            3 |                    2 | 0xfea0       | 1.3.6.1.4.1.2.267.7.4.4  |
+| dilithium2 **hybrid with** p256                   | 3.1                                           |            3 |                    2 | 0xfea1       | 1.3.9999.2.7.1           |
+| dilithium2 **hybrid with** rsa3072                | 3.1                                           |            3 |                    2 | 0xfea2       | 1.3.9999.2.7.2           |
+| dilithium3                                        | 3.1                                           |            3 |                    3 | 0xfea3       | 1.3.6.1.4.1.2.267.7.6.5  |
+| dilithium3 **hybrid with** p384                   | 3.1                                           |            3 |                    3 | 0xfea4       | 1.3.9999.2.7.3           |
+| dilithium5                                        | 3.1                                           |            3 |                    5 | 0xfea5       | 1.3.6.1.4.1.2.267.7.8.7  |
+| dilithium5 **hybrid with** p521                   | 3.1                                           |            3 |                    5 | 0xfea6       | 1.3.9999.2.7.4           |
+| dilithium2_aes                                    | NIST Round 3 submission                       |            3 |                    2 | 0xfea7       | 1.3.6.1.4.1.2.267.11.4.4 |
+| dilithium2_aes **hybrid with** p256               | NIST Round 3 submission                       |            3 |                    2 | 0xfea8       | 1.3.9999.2.11.1          |
+| dilithium2_aes **hybrid with** rsa3072            | NIST Round 3 submission                       |            3 |                    2 | 0xfea9       | 1.3.9999.2.11.2          |
+| dilithium3_aes                                    | NIST Round 3 submission                       |            3 |                    3 | 0xfeaa       | 1.3.6.1.4.1.2.267.11.6.5 |
+| dilithium3_aes **hybrid with** p384               | NIST Round 3 submission                       |            3 |                    3 | 0xfeab       | 1.3.9999.2.11.3          |
+| dilithium5_aes                                    | NIST Round 3 submission                       |            3 |                    5 | 0xfeac       | 1.3.6.1.4.1.2.267.11.8.7 |
+| dilithium5_aes **hybrid with** p521               | NIST Round 3 submission                       |            3 |                    5 | 0xfead       | 1.3.9999.2.11.4          |
+| falcon512                                         | 20211101                                      |            3 |                    1 | 0xfeae       | 1.3.9999.3.6             |
+| falcon512 **hybrid with** p256                    | 20211101                                      |            3 |                    1 | 0xfeaf       | 1.3.9999.3.7             |
+| falcon512 **hybrid with** rsa3072                 | 20211101                                      |            3 |                    1 | 0xfeb0       | 1.3.9999.3.8             |
+| falcon512                                         | NIST Round 3 submission                       |            3 |                    1 | 0xfe0b       | 1.3.9999.3.1             |
+| falcon512 **hybrid with** p256                    | NIST Round 3 submission                       |            3 |                    1 | 0xfe0c       | 1.3.9999.3.2             |
+| falcon512 **hybrid with** rsa3072                 | NIST Round 3 submission                       |            3 |                    1 | 0xfe0d       | 1.3.9999.3.3             |
+| falcon1024                                        | 20211101                                      |            3 |                    5 | 0xfeb1       | 1.3.9999.3.9             |
+| falcon1024 **hybrid with** p521                   | 20211101                                      |            3 |                    5 | 0xfeb2       | 1.3.9999.3.10            |
+| falcon1024                                        | NIST Round 3 submission                       |            3 |                    5 | 0xfe0e       | 1.3.9999.3.4             |
+| falcon1024 **hybrid with** p521                   | NIST Round 3 submission                       |            3 |                    5 | 0xfe0f       | 1.3.9999.3.5             |
+| sphincsharaka128frobust                           | NIST Round 3 submission                       |            3 |                    1 | 0xfe42       | 1.3.9999.6.1.1           |
+| sphincsharaka128frobust **hybrid with** p256      | NIST Round 3 submission                       |            3 |                    1 | 0xfe43       | 1.3.9999.6.1.2           |
+| sphincsharaka128frobust **hybrid with** rsa3072   | NIST Round 3 submission                       |            3 |                    1 | 0xfe44       | 1.3.9999.6.1.3           |
+| sphincsharaka128fsimple                           | NIST Round 3 submission                       |            3 |                    1 | 0xfe45       | 1.3.9999.6.1.4           |
+| sphincsharaka128fsimple **hybrid with** p256      | NIST Round 3 submission                       |            3 |                    1 | 0xfe46       | 1.3.9999.6.1.5           |
+| sphincsharaka128fsimple **hybrid with** rsa3072   | NIST Round 3 submission                       |            3 |                    1 | 0xfe47       | 1.3.9999.6.1.6           |
+| sphincsharaka128srobust                           | NIST Round 3 submission                       |            3 |                    1 | 0xfe48       | 1.3.9999.6.1.7           |
+| sphincsharaka128srobust **hybrid with** p256      | NIST Round 3 submission                       |            3 |                    1 | 0xfe49       | 1.3.9999.6.1.8           |
+| sphincsharaka128srobust **hybrid with** rsa3072   | NIST Round 3 submission                       |            3 |                    1 | 0xfe4a       | 1.3.9999.6.1.9           |
+| sphincsharaka128ssimple                           | NIST Round 3 submission                       |            3 |                    1 | 0xfe4b       | 1.3.9999.6.1.10          |
+| sphincsharaka128ssimple **hybrid with** p256      | NIST Round 3 submission                       |            3 |                    1 | 0xfe4c       | 1.3.9999.6.1.11          |
+| sphincsharaka128ssimple **hybrid with** rsa3072   | NIST Round 3 submission                       |            3 |                    1 | 0xfe4d       | 1.3.9999.6.1.12          |
+| sphincsharaka192frobust                           | NIST Round 3 submission                       |            3 |                    3 | 0xfe4e       | 1.3.9999.6.2.1           |
+| sphincsharaka192frobust **hybrid with** p384      | NIST Round 3 submission                       |            3 |                    3 | 0xfe4f       | 1.3.9999.6.2.2           |
+| sphincsharaka192fsimple                           | NIST Round 3 submission                       |            3 |                    3 | 0xfe50       | 1.3.9999.6.2.3           |
+| sphincsharaka192fsimple **hybrid with** p384      | NIST Round 3 submission                       |            3 |                    3 | 0xfe51       | 1.3.9999.6.2.4           |
+| sphincsharaka192srobust                           | NIST Round 3 submission                       |            3 |                    3 | 0xfe52       | 1.3.9999.6.2.5           |
+| sphincsharaka192srobust **hybrid with** p384      | NIST Round 3 submission                       |            3 |                    3 | 0xfe53       | 1.3.9999.6.2.6           |
+| sphincsharaka192ssimple                           | NIST Round 3 submission                       |            3 |                    3 | 0xfe54       | 1.3.9999.6.2.7           |
+| sphincsharaka192ssimple **hybrid with** p384      | NIST Round 3 submission                       |            3 |                    3 | 0xfe55       | 1.3.9999.6.2.8           |
+| sphincsharaka256frobust                           | NIST Round 3 submission                       |            3 |                    3 | 0xfe56       | 1.3.9999.6.3.1           |
+| sphincsharaka256frobust **hybrid with** p521      | NIST Round 3 submission                       |            3 |                    3 | 0xfe57       | 1.3.9999.6.3.2           |
+| sphincsharaka256fsimple                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe58       | 1.3.9999.6.3.3           |
+| sphincsharaka256fsimple **hybrid with** p521      | NIST Round 3 submission                       |            3 |                    5 | 0xfe59       | 1.3.9999.6.3.4           |
+| sphincsharaka256srobust                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe5a       | 1.3.9999.6.3.5           |
+| sphincsharaka256srobust **hybrid with** p521      | NIST Round 3 submission                       |            3 |                    5 | 0xfe5b       | 1.3.9999.6.3.6           |
+| sphincsharaka256ssimple                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe5c       | 1.3.9999.6.3.7           |
+| sphincsharaka256ssimple **hybrid with** p521      | NIST Round 3 submission                       |            3 |                    5 | 0xfe5d       | 1.3.9999.6.3.8           |
+| sphincssha26128frobust                            | NIST Round 3 submission                       |            3 |                    5 | 0xfe5e       | 1.3.9999.6.4.1           |
+| sphincssha26128frobust **hybrid with** p256       | NIST Round 3 submission                       |            3 |                    5 | 0xfe5f       | 1.3.9999.6.4.2           |
+| sphincssha26128frobust **hybrid with** rsa3072    | NIST Round 3 submission                       |            3 |                    5 | 0xfe60       | 1.3.9999.6.4.3           |
+| sphincssha2128fsimple                             | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfeb3       | 1.3.9999.6.4.13          |
+| sphincssha2128fsimple **hybrid with** p256        | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfeb4       | 1.3.9999.6.4.14          |
+| sphincssha2128fsimple **hybrid with** rsa3072     | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfeb5       | 1.3.9999.6.4.15          |
+| sphincssha2128fsimple                             | NIST Round 3 submission                       |            3 |                    1 | 0xfe61       | 1.3.9999.6.4.4           |
+| sphincssha2128fsimple **hybrid with** p256        | NIST Round 3 submission                       |            3 |                    1 | 0xfe62       | 1.3.9999.6.4.5           |
+| sphincssha2128fsimple **hybrid with** rsa3072     | NIST Round 3 submission                       |            3 |                    1 | 0xfe63       | 1.3.9999.6.4.6           |
+| sphincssha256128srobust                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe64       | 1.3.9999.6.4.7           |
+| sphincssha256128srobust **hybrid with** p256      | NIST Round 3 submission                       |            3 |                    5 | 0xfe65       | 1.3.9999.6.4.8           |
+| sphincssha256128srobust **hybrid with** rsa3072   | NIST Round 3 submission                       |            3 |                    5 | 0xfe66       | 1.3.9999.6.4.9           |
+| sphincssha2128ssimple                             | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfeb6       | 1.3.9999.6.4.16          |
+| sphincssha2128ssimple **hybrid with** p256        | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfeb7       | 1.3.9999.6.4.17          |
+| sphincssha2128ssimple **hybrid with** rsa3072     | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfeb8       | 1.3.9999.6.4.18          |
+| sphincssha2128ssimple                             | NIST Round 3 submission                       |            3 |                    1 | 0xfe67       | 1.3.9999.6.4.10          |
+| sphincssha2128ssimple **hybrid with** p256        | NIST Round 3 submission                       |            3 |                    1 | 0xfe68       | 1.3.9999.6.4.11          |
+| sphincssha2128ssimple **hybrid with** rsa3072     | NIST Round 3 submission                       |            3 |                    1 | 0xfe69       | 1.3.9999.6.4.12          |
+| sphincssha256192frobust                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe6a       | 1.3.9999.6.5.1           |
+| sphincssha256192frobust **hybrid with** p384      | NIST Round 3 submission                       |            3 |                    5 | 0xfe6b       | 1.3.9999.6.5.2           |
+| sphincssha2192fsimple                             | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfeb9       | 1.3.9999.6.5.10          |
+| sphincssha2192fsimple **hybrid with** p384        | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfeba       | 1.3.9999.6.5.11          |
+| sphincssha2192fsimple                             | NIST Round 3 submission                       |            3 |                    3 | 0xfe6c       | 1.3.9999.6.5.3           |
+| sphincssha2192fsimple **hybrid with** p384        | NIST Round 3 submission                       |            3 |                    3 | 0xfe6d       | 1.3.9999.6.5.4           |
+| sphincssha256192srobust                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe6e       | 1.3.9999.6.5.5           |
+| sphincssha256192srobust **hybrid with** p384      | NIST Round 3 submission                       |            3 |                    5 | 0xfe6f       | 1.3.9999.6.5.6           |
+| sphincssha2192ssimple                             | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfebb       | 1.3.9999.6.5.12          |
+| sphincssha2192ssimple **hybrid with** p384        | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfebc       | 1.3.9999.6.5.13          |
+| sphincssha2192ssimple                             | NIST Round 3 submission                       |            3 |                    3 | 0xfe70       | 1.3.9999.6.5.7           |
+| sphincssha2192ssimple **hybrid with** p384        | NIST Round 3 submission                       |            3 |                    3 | 0xfe71       | 1.3.9999.6.5.8           |
+| sphincssha256256frobust                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe72       | 1.3.9999.6.6.1           |
+| sphincssha256256frobust **hybrid with** p521      | NIST Round 3 submission                       |            3 |                    5 | 0xfe73       | 1.3.9999.6.6.2           |
+| sphincssha2256fsimple                             | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfebd       | 1.3.9999.6.6.10          |
+| sphincssha2256fsimple **hybrid with** p521        | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfebe       | 1.3.9999.6.6.11          |
+| sphincssha2256fsimple                             | NIST Round 3 submission                       |            3 |                    5 | 0xfe74       | 1.3.9999.6.6.3           |
+| sphincssha2256fsimple **hybrid with** p521        | NIST Round 3 submission                       |            3 |                    5 | 0xfe75       | 1.3.9999.6.6.4           |
+| sphincssha256256srobust                           | NIST Round 3 submission                       |            3 |                    5 | 0xfe76       | 1.3.9999.6.6.5           |
+| sphincssha256256srobust **hybrid with** p521      | NIST Round 3 submission                       |            3 |                    5 | 0xfe77       | 1.3.9999.6.6.6           |
+| sphincssha2256ssimple                             | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfec0       | 1.3.9999.6.6.12          |
+| sphincssha2256ssimple **hybrid with** p521        | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfec1       | 1.3.9999.6.6.13          |
+| sphincssha2256ssimple                             | NIST Round 3 submission                       |            3 |                    5 | 0xfe78       | 1.3.9999.6.6.7           |
+| sphincssha2256ssimple **hybrid with** p521        | NIST Round 3 submission                       |            3 |                    5 | 0xfe79       | 1.3.9999.6.6.8           |
+| sphincsshake256128frobust                         | NIST Round 3 submission                       |            3 |                    1 | 0xfe7a       | 1.3.9999.6.7.1           |
+| sphincsshake256128frobust **hybrid with** p256    | NIST Round 3 submission                       |            3 |                    1 | 0xfe7b       | 1.3.9999.6.7.2           |
+| sphincsshake256128frobust **hybrid with** rsa3072 | NIST Round 3 submission                       |            3 |                    1 | 0xfe7c       | 1.3.9999.6.7.3           |
+| sphincsshake128fsimple                            | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfec2       | 1.3.9999.6.7.13          |
+| sphincsshake128fsimple **hybrid with** p256       | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfec3       | 1.3.9999.6.7.14          |
+| sphincsshake128fsimple **hybrid with** rsa3072    | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfec4       | 1.3.9999.6.7.15          |
+| sphincsshake128fsimple                            | NIST Round 3 submission                       |            3 |                    1 | 0xfe7d       | 1.3.9999.6.7.4           |
+| sphincsshake128fsimple **hybrid with** p256       | NIST Round 3 submission                       |            3 |                    1 | 0xfe7e       | 1.3.9999.6.7.5           |
+| sphincsshake128fsimple **hybrid with** rsa3072    | NIST Round 3 submission                       |            3 |                    1 | 0xfe7f       | 1.3.9999.6.7.6           |
+| sphincsshake256128srobust                         | NIST Round 3 submission                       |            3 |                    1 | 0xfe80       | 1.3.9999.6.7.7           |
+| sphincsshake256128srobust **hybrid with** p256    | NIST Round 3 submission                       |            3 |                    1 | 0xfe81       | 1.3.9999.6.7.8           |
+| sphincsshake256128srobust **hybrid with** rsa3072 | NIST Round 3 submission                       |            3 |                    1 | 0xfe82       | 1.3.9999.6.7.9           |
+| sphincsshake128ssimple                            | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfec5       | 1.3.9999.6.7.16          |
+| sphincsshake128ssimple **hybrid with** p256       | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfec6       | 1.3.9999.6.7.17          |
+| sphincsshake128ssimple **hybrid with** rsa3072    | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    1 | 0xfec7       | 1.3.9999.6.7.18          |
+| sphincsshake128ssimple                            | NIST Round 3 submission                       |            3 |                    1 | 0xfe83       | 1.3.9999.6.7.10          |
+| sphincsshake128ssimple **hybrid with** p256       | NIST Round 3 submission                       |            3 |                    1 | 0xfe84       | 1.3.9999.6.7.11          |
+| sphincsshake128ssimple **hybrid with** rsa3072    | NIST Round 3 submission                       |            3 |                    1 | 0xfe85       | 1.3.9999.6.7.12          |
+| sphincsshake256192frobust                         | NIST Round 3 submission                       |            3 |                    3 | 0xfe86       | 1.3.9999.6.8.1           |
+| sphincsshake256192frobust **hybrid with** p384    | NIST Round 3 submission                       |            3 |                    3 | 0xfe87       | 1.3.9999.6.8.2           |
+| sphincsshake192fsimple                            | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfec8       | 1.3.9999.6.8.10          |
+| sphincsshake192fsimple **hybrid with** p384       | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfec9       | 1.3.9999.6.8.11          |
+| sphincsshake192fsimple                            | NIST Round 3 submission                       |            3 |                    3 | 0xfe88       | 1.3.9999.6.8.3           |
+| sphincsshake192fsimple **hybrid with** p384       | NIST Round 3 submission                       |            3 |                    3 | 0xfe89       | 1.3.9999.6.8.4           |
+| sphincsshake256192srobust                         | NIST Round 3 submission                       |            3 |                    3 | 0xfe8a       | 1.3.9999.6.8.5           |
+| sphincsshake256192srobust **hybrid with** p384    | NIST Round 3 submission                       |            3 |                    3 | 0xfe8b       | 1.3.9999.6.8.6           |
+| sphincsshake192ssimple                            | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfeca       | 1.3.9999.6.8.12          |
+| sphincsshake192ssimple **hybrid with** p384       | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    3 | 0xfecb       | 1.3.9999.6.8.13          |
+| sphincsshake192ssimple                            | NIST Round 3 submission                       |            3 |                    3 | 0xfe8c       | 1.3.9999.6.8.7           |
+| sphincsshake192ssimple **hybrid with** p384       | NIST Round 3 submission                       |            3 |                    3 | 0xfe8d       | 1.3.9999.6.8.8           |
+| sphincsshake256256frobust                         | NIST Round 3 submission                       |            3 |                    5 | 0xfe8e       | 1.3.9999.6.9.1           |
+| sphincsshake256256frobust **hybrid with** p521    | NIST Round 3 submission                       |            3 |                    5 | 0xfe8f       | 1.3.9999.6.9.2           |
+| sphincsshake256fsimple                            | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfecc       | 1.3.9999.6.9.10          |
+| sphincsshake256fsimple **hybrid with** p521       | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfecd       | 1.3.9999.6.9.11          |
+| sphincsshake256fsimple                            | NIST Round 3 submission                       |            3 |                    5 | 0xfe90       | 1.3.9999.6.9.3           |
+| sphincsshake256fsimple **hybrid with** p521       | NIST Round 3 submission                       |            3 |                    5 | 0xfe91       | 1.3.9999.6.9.4           |
+| sphincsshake256256srobust                         | NIST Round 3 submission                       |            3 |                    5 | 0xfe92       | 1.3.9999.6.9.5           |
+| sphincsshake256256srobust **hybrid with** p521    | NIST Round 3 submission                       |            3 |                    5 | 0xfe93       | 1.3.9999.6.9.6           |
+| sphincsshake256ssimple                            | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfece       | 1.3.9999.6.9.12          |
+| sphincsshake256ssimple **hybrid with** p521       | NIST Round 3 submission, v3.1 (June 10, 2022) |            3 |                    5 | 0xfecf       | 1.3.9999.6.9.13          |
+| sphincsshake256ssimple                            | NIST Round 3 submission                       |            3 |                    5 | 0xfe94       | 1.3.9999.6.9.7           |
+| sphincsshake256ssimple **hybrid with** p521       | NIST Round 3 submission                       |            3 |                    5 | 0xfe95       | 1.3.9999.6.9.8           |
\ No newline at end of file