Added action queue, and event class