Add newer knowledge structures, more in line with what we'd want for IPP