Updated schematron criteria groups to have composite key