Refactoring with the further removing class type EventQueueable.