Changes to Executor