Add tracking of additional events
Add tests for additional events