Refactor towards unified events
Include :service_accessed in list of events