Refactor drive utilities functionality