AVertexMap significant upgrade