Before change to remove type from Event.