Added EventHandler class