Updated event queue to support upstream messages