Add (incomplete) support for arc-features