WIP #882 Add more hooks v2