Update to data_event_manager