DACCOSIM 4.25.1
Refactoring