Update event queue to be a little bit more generic