SimulationFactory refactored & subtasks implemented