Adding support for graph options