Added support for graph type