Refactor Arc utility library