Added CriteriaParser for symmetry with CriteriaFormatter