Updated event queue system