Refactoring in ParallelStrategy scope