Various updates for simulation