Changes to add maxlength and correct criteriaRelationship verification