Re-added Vertex class