ZSS-613 move the event-queue handling back to model and use two different adapter to handle direct and event-queue listener.