diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosDocument.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosDocument.java
index e1b1bb4a9..453e82e35 100644
--- a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosDocument.java
+++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosDocument.java
@@ -462,7 +462,7 @@ private static List<org.verapdf.model.pdlayer.PDDocument> getDocument() {
 	}
 
 	private List<org.verapdf.model.salayer.SAPDFDocument> getdocument() {
-		if (StaticContainers.getFlavour() == PDFAFlavour.WCAG2_1 &&
+		if (StaticContainers.getFlavour().getPart().getFamily() == PDFAFlavour.SpecificationFamily.WCAG &&
 				StaticResources.getDocument() != null && isPresent(GFSAPDFDOCUMENT_CLASS_NAME)) {
 			List<org.verapdf.model.salayer.SAPDFDocument> list = new ArrayList<>(MAX_NUMBER_OF_ELEMENTS);
 			list.add(new GFSAPDFDocument(StaticResources.getDocument()));
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructElem.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructElem.java
index cd72dbdb8..50fa24e93 100644
--- a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructElem.java
+++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructElem.java
@@ -178,7 +178,7 @@ private boolean hasStandardType(){
 			if (flavour.getPart() == PDFAFlavour.Specification.ISO_19005_4 || flavour == PDFAFlavour.PDFUA_2) {
 				return TaggedPDFHelper.isStandardType(type);
 			}
-			if (flavour.getPart() == PDFAFlavour.Specification.WCAG_2_1) {
+			if (flavour.getPart().getFamily() == PDFAFlavour.SpecificationFamily.WCAG) {
 				return TaggedPDFHelper.isWCAGStandardType(type) &&
 						!TaggedPDFConstants.TITLE.equals(type.getType().getValue());
 			}
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructTreeNode.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructTreeNode.java
index 282fbe515..223b9117c 100644
--- a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructTreeNode.java
+++ b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructTreeNode.java
@@ -53,7 +53,7 @@ protected GFPDStructTreeNode(org.verapdf.pd.structure.PDStructTreeNode structTre
 	@Override
 	public String getkidsStandardTypes() {
 		if (StaticContainers.getFlavour() != null &&
-		    StaticContainers.getFlavour().getPart() == PDFAFlavour.Specification.WCAG_2_1) {
+		    StaticContainers.getFlavour().getPart().getFamily() == PDFAFlavour.SpecificationFamily.WCAG) {
 			return this.getChildrenStandardTypes()
 			           .stream()
 			           .filter(type -> type != null && !TaggedPDFConstants.ARTIFACT.equals(type))