Minor changes to the graph class