Added temporary queue support