Changes to support better streaming of events