Added graph support
update