Added support for generic edge type