Update for arc support