- Fixed registration bug
- Adjusted event header