Added important explicit events.
Updates to work with the new integration.
Removed explicit event mapping