Change queue to global components