Updates to use docools version 12