Include more traces and annotated traces for posterity