Moved MapVertex to its own class