Added remainder of node & edge data