More Simulator API changes.