Event hooks for everybody

This resolves the inconsistency with event hooks.