Added arc support