Improved graphviz generator