Created for chapter 18 - stage 5 - added correlation and event handlers