Renamed DataVertex to LabelledVertex