Adding in improvements based on feedback from John Ruiz.
Added ability to pull the topic from the Event Stream