Add simulator improvements.