Executor implementation updated