Improvements to graph