Add simulator enhancements.