Updated for Graph.php