Small change to Executor organization