Refactored call events into general events.