Edge and Vertex are now also generic - still some string specifics to cut out