Use new hook signatures