Added event processing