Refactored events.
Added events to identity map.