Update to the new queue format. Closes #29