Removed flag, will be replaced by event type