Handle empty queue
Rename bundle