Added protection for entities in vehicles