Changed to WDAGraph