Added graph building feature