Added queue management