Changed appropriate attributes to properties in simulation.