Add forgotten classes to EventHandler class.