Improved graph functionality