Updated Simulation to support class-based models