Moved graph generation