Redid Edge/vertex Set classes