Vastly improved graph functionality