Add some event processing