The Bouncy Castle Java PQC Addon APIs contains some tools for adding the use of NewHope, FrodoKEM, and Classic McEliece to KAS and Key Transport via the use of supplementary private info allowing the mechanisms to stay FIPS compliant with (hopefully) a touch of Quantum Hardening.