WIP
Add missing hooks back