ENH Changed arc features to use more contextual information.