Add a way to turn off the use of threads for completion