Update for simulator changes