Improved EventHandler class.