Update to latest queue apis