- Added bypass for event registration