Continued working on ExecutionManager