Moving hooks to addons