Add support for bundle FindHook
Add support for bundle EventHook