Updates while working on datastream delete event