Change the Executor to allow waiting for many things