Moved to Map from Set on vertices