Resolved dependency issues and tweaked reporter to hold state about the class of event generated