Modified for generic network analysis