Removed the VertexId and FaceId wrapper classes