Refactor hooks to use new utility methods