Added getEdgeMap and multiple modifications