Change Executor to ExecutorContext