Added initial arc support