Updated to work with latest master branch of slm/queue