Added SystemAvoidingSearchCriterion