Update for event queue mechanism.