Add support for newer versions of simulator.