Updated EvenHandler to reflect changes in the library