Added EligibilityCriteriaDataDefinition and evaluator