Refactors for full utility