Graphs improvements