Updated DefaultExecutor code to match new concurrency