Added some tracking of the vertex_ids and edge_ids