Add option to have queue off