Updates to integration of Controller and Simulator.