Refactor ExecutionContext