Added unlimited queue support