Added graph generation