Added eventHandler class