Update Hooks

Update to support the current hooks changes.