Added graph node support