Added simulator detection