Better graph support