Removed HasEvaluated field