Vertex now stores the key of its value, too