Further adjustment of simulation classes