Separated simulation and raw output classes, increased performance