Use new hook generator