Update to pass in ExecutionContext