Updated Event listener to work with streaming.