New branch for GraphViz support