Added graph support