Renamed {Edge, Vertex}Type to Tpe (not the best name, but The aim is to unify names); Restructured properties a bit