Added queue support