EventHandler class added