Adding support for enabled/disabled edges