Add explicit output file for diagram, as then we can capture it as separate from the document.
Add War Magic.