Move the other events into eventHandler