Added more simulation classes