Updated EventHooks