Add simulator checks