ExecutionManager added
Merge with local branch