Refactoring, added Eid property in IExecutor