Better arc handling