Revised  vertex and edge classes