Updated for latest library

Updated to support library with unlimited queue and one function per queue.