Adding graph support