Added option to not create new queue