Feature/queue mode