Redesigned Executor to be provided by ServiceLocator