Bug fixes
Add event data