Add dual graph capability and debugging info