Updated reporting to use new Event classes