diff --git a/README.md b/README.md
index f881fb55..9d88f3ec 100644
--- a/README.md
+++ b/README.md
@@ -192,6 +192,7 @@ I hope that with the introduction of PINT, the versioning problem will be solved
 # News and noteworthy
  
 * v3.1.10 - work in progress
+    * Added support for EN 16931 rules v1.3.12 format and deprecated v1.3.10
     * All OIOUBL 1.x validations are now correctly based on UBL 2.1 instead of UBL 2.0
     * Extracted the rules for the legacy OIOUBL rules into a separate registerable entity (`OIOUBLLegacyValidation`).
 * v3.1.9 - 2024-03-22
diff --git a/phive-rules-cii/src/main/java/com/helger/phive/cii/CIIValidation.java b/phive-rules-cii/src/main/java/com/helger/phive/cii/CIIValidation.java
index fe7b4600..fbbcafc5 100644
--- a/phive-rules-cii/src/main/java/com/helger/phive/cii/CIIValidation.java
+++ b/phive-rules-cii/src/main/java/com/helger/phive/cii/CIIValidation.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -47,6 +49,12 @@ public final class CIIValidation
   private CIIValidation ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard CII D16B validation execution sets to the provided
    * registry.
@@ -66,7 +74,7 @@ public static void initCIID16B (@Nonnull final IValidationExecutorSetRegistry <I
     // No Schematrons here
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_D16B_CROSSINDUSTRYINVOICE,
                                                                            "CII CrossIndustryInvoice " + VERSION_D16B,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ())));
   }
 }
diff --git a/phive-rules-cius-pt/src/main/java/com/helger/phive/ciuspt/CIUS_PTValidation.java b/phive-rules-cius-pt/src/main/java/com/helger/phive/ciuspt/CIUS_PTValidation.java
index f589becf..69bab032 100644
--- a/phive-rules-cius-pt/src/main/java/com/helger/phive/ciuspt/CIUS_PTValidation.java
+++ b/phive-rules-cius-pt/src/main/java/com/helger/phive/ciuspt/CIUS_PTValidation.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -74,6 +76,12 @@ private static ClassLoader _getCL ()
     return CIUS_PTValidation.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard CIUS-PT validation execution sets to the provided
    * registry.
@@ -92,14 +100,14 @@ public static void initCIUS_PT (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_PT_UBL_CREDITNOTE_200,
                                                                            "CIUS-PT UBL Credit Note " +
                                                                                                            VID_CIUS_PT_UBL_CREDITNOTE_200.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (RES_200,
                                                                                                                     UBL21NamespaceContext.getInstance ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_PT_UBL_INVOICE_200,
                                                                            "CIUS-PT UBL Invoice " +
                                                                                                         VID_CIUS_PT_UBL_INVOICE_200.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (RES_200,
                                                                                                                     UBL21NamespaceContext.getInstance ())));
@@ -108,14 +116,14 @@ public static void initCIUS_PT (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_PT_UBL_CREDITNOTE_211,
                                                                            "CIUS-PT UBL Credit Note " +
                                                                                                            VID_CIUS_PT_UBL_CREDITNOTE_211.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (RES_211,
                                                                                                                     UBL21NamespaceContext.getInstance ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_PT_UBL_INVOICE_211,
                                                                            "CIUS-PT UBL Invoice " +
                                                                                                         VID_CIUS_PT_UBL_INVOICE_211.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (RES_211,
                                                                                                                     UBL21NamespaceContext.getInstance ())));
diff --git a/phive-rules-cius-ro/src/main/java/com/helger/phive/ciusro/CIUS_ROValidation.java b/phive-rules-cius-ro/src/main/java/com/helger/phive/ciusro/CIUS_ROValidation.java
index 8d7407cb..a4caef96 100644
--- a/phive-rules-cius-ro/src/main/java/com/helger/phive/ciusro/CIUS_ROValidation.java
+++ b/phive-rules-cius-ro/src/main/java/com/helger/phive/ciusro/CIUS_ROValidation.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.en16931.EN16931Validation;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -77,6 +79,12 @@ private static ClassLoader _getCL ()
     return CIUS_ROValidation.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard CIUS-RO validation execution sets to the provided
    * registry.
@@ -96,7 +104,7 @@ public static void initCIUS_RO (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_RO_UBL_CREDITNOTE_103,
                                                                            "CIUS-RO UBL Credit Note " +
                                                                                                            VID_CIUS_RO_UBL_CREDITNOTE_103.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_137_XSLT,
                                                                                                                     UBL21NamespaceContext.getInstance ()),
@@ -105,7 +113,7 @@ public static void initCIUS_RO (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_RO_UBL_INVOICE_103,
                                                                            "CIUS-RO UBL Invoice " +
                                                                                                         VID_CIUS_RO_UBL_INVOICE_103.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_137_XSLT,
                                                                                                                     UBL21NamespaceContext.getInstance ()),
@@ -116,7 +124,7 @@ public static void initCIUS_RO (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_RO_UBL_CREDITNOTE_104,
                                                                            "CIUS-RO UBL Credit Note " +
                                                                                                            VID_CIUS_RO_UBL_CREDITNOTE_104.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_137_XSLT,
                                                                                                                     UBL21NamespaceContext.getInstance ()),
@@ -125,7 +133,7 @@ public static void initCIUS_RO (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_RO_UBL_INVOICE_104,
                                                                            "CIUS-RO UBL Invoice " +
                                                                                                         VID_CIUS_RO_UBL_INVOICE_104.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_137_XSLT,
                                                                                                                     UBL21NamespaceContext.getInstance ()),
@@ -136,7 +144,7 @@ public static void initCIUS_RO (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_RO_UBL_CREDITNOTE_108,
                                                                            "CIUS-RO UBL Credit Note " +
                                                                                                            VID_CIUS_RO_UBL_CREDITNOTE_108.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_138_XSLT,
                                                                                                                     UBL21NamespaceContext.getInstance ()),
@@ -145,7 +153,7 @@ public static void initCIUS_RO (@Nonnull final IValidationExecutorSetRegistry <I
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CIUS_RO_UBL_INVOICE_108,
                                                                            "CIUS-RO UBL Invoice " +
                                                                                                         VID_CIUS_RO_UBL_INVOICE_108.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_138_XSLT,
                                                                                                                     UBL21NamespaceContext.getInstance ()),
diff --git a/phive-rules-ebinterface/src/main/java/com/helger/phive/ebinterface/EbInterfaceValidation.java b/phive-rules-ebinterface/src/main/java/com/helger/phive/ebinterface/EbInterfaceValidation.java
index 2405e84a..009028b1 100644
--- a/phive-rules-ebinterface/src/main/java/com/helger/phive/ebinterface/EbInterfaceValidation.java
+++ b/phive-rules-ebinterface/src/main/java/com/helger/phive/ebinterface/EbInterfaceValidation.java
@@ -24,6 +24,8 @@
 import com.helger.ebinterface.CEbInterface;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
 
@@ -50,6 +52,12 @@ public final class EbInterfaceValidation
   private EbInterfaceValidation ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard ebInterface validation execution sets to the provided
    * registry.
@@ -67,39 +75,39 @@ public static void initEbInterface (@Nonnull final IValidationExecutorSetRegistr
     // No Schematrons here
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_30,
                                                                            "ebInterface 3.0",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_30_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_302,
                                                                            "ebInterface 3.0.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_302_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_40,
                                                                            "ebInterface 4.0",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_40_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_41,
                                                                            "ebInterface 4.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_41_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_42,
                                                                            "ebInterface 4.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_42_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_43,
                                                                            "ebInterface 4.3",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_43_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_50,
                                                                            "ebInterface 5.0",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_50_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_60,
                                                                            "ebInterface 6.0",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_60_XSDS)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EBI_61,
                                                                            "ebInterface 6.1",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CEbInterface.EBINTERFACE_61_XSDS)));
   }
 }
diff --git a/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG2.java b/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG2.java
index 128dd504..481576de 100644
--- a/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG2.java
+++ b/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG2.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -186,6 +188,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard EHF validation execution sets to the provided
    * registry.
@@ -206,7 +214,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_1_0_13,
                                                                            "EHF Catalogue " +
                                                                                                      VID_EHF_CATALOGUE_1_0_13.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T19.xslt",
@@ -219,7 +227,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_RESPONSE_1_0_13,
                                                                            "EHF Catalogue Response " +
                                                                                                               VID_EHF_CATALOGUE_RESPONSE_1_0_13.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T58.xslt",
@@ -232,7 +240,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CREDITNOTE_2_0_15,
                                                                            "EHF Creditnote " +
                                                                                                       VID_EHF_CREDITNOTE_2_0_15.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T14.xslt",
@@ -245,7 +253,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_DESPATCH_ADVICE_1_0_10,
                                                                            "EHF Despatch Advice " +
                                                                                                            VID_EHF_DESPATCH_ADVICE_1_0_10.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T16.xslt",
@@ -258,7 +266,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_INVOICE_2_0_15,
                                                                            "EHF Invoice " +
                                                                                                    VID_EHF_INVOICE_2_0_15.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T10.xslt",
@@ -271,7 +279,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_1_0_11,
                                                                            "EHF Ordering " +
                                                                                                  VID_EHF_ORDER_1_0_11.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T01.xslt",
@@ -284,7 +292,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_AGREEMENT_1_0_2,
                                                                            "EHF Order Agreement " +
                                                                                                           VID_EHF_ORDER_AGREEMENT_1_0_2.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T110.xslt",
@@ -297,7 +305,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_RESPONSE_1_0_11,
                                                                            "EHF Order Response " +
                                                                                                           VID_EHF_ORDER_RESPONSE_1_0_11.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T76.xslt",
@@ -310,7 +318,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_PUNCH_OUT_1_0_1,
                                                                            "EHF Punch Out " +
                                                                                                     VID_EHF_PUNCH_OUT_1_0_1.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201811 +
                                                                                                                "BIIRULES-UBL-T77.xslt",
@@ -325,7 +333,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_REMINDER_1_1_0,
                                                                            "EHF Reminder " +
                                                                                                    VID_EHF_REMINDER_1_1_0.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllReminderXSDs ()),
                                                                            _createXSLT (EHF_COMMON_V1_0_4),
                                                                            _createXSLT (EHF_REMINDER_V1_1_0)));
@@ -334,7 +342,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_1_0_14,
                                                                            "EHF Catalogue " +
                                                                                                      VID_EHF_CATALOGUE_1_0_14.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T19.xslt",
@@ -347,7 +355,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_RESPONSE_1_0_14,
                                                                            "EHF Catalogue Response " +
                                                                                                               VID_EHF_CATALOGUE_RESPONSE_1_0_14.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T58.xslt",
@@ -360,7 +368,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CREDITNOTE_2_0_16,
                                                                            "EHF Creditnote " +
                                                                                                       VID_EHF_CREDITNOTE_2_0_16.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T14.xslt",
@@ -373,7 +381,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_DESPATCH_ADVICE_1_0_11,
                                                                            "EHF Despatch Advice " +
                                                                                                            VID_EHF_DESPATCH_ADVICE_1_0_11.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T16.xslt",
@@ -386,7 +394,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_INVOICE_2_0_16,
                                                                            "EHF Invoice " +
                                                                                                    VID_EHF_INVOICE_2_0_16.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T10.xslt",
@@ -399,7 +407,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_1_0_12,
                                                                            "EHF Ordering " +
                                                                                                  VID_EHF_ORDER_1_0_12.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T01.xslt",
@@ -412,7 +420,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_AGREEMENT_1_0_3,
                                                                            "EHF Order Agreement " +
                                                                                                           VID_EHF_ORDER_AGREEMENT_1_0_3.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T110.xslt",
@@ -425,7 +433,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_RESPONSE_1_0_12,
                                                                            "EHF Order Response " +
                                                                                                           VID_EHF_ORDER_RESPONSE_1_0_12.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T76.xslt",
@@ -438,7 +446,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_PUNCH_OUT_1_0_2,
                                                                            "EHF Punch Out " +
                                                                                                     VID_EHF_PUNCH_OUT_1_0_2.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201906 +
                                                                                                                "BIIRULES-UBL-T77.xslt",
@@ -454,7 +462,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_1_0_15,
                                                                            "EHF Catalogue " +
                                                                                                      VID_EHF_CATALOGUE_1_0_15.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T19.xslt",
@@ -467,7 +475,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_RESPONSE_1_0_15,
                                                                            "EHF Catalogue Response " +
                                                                                                               VID_EHF_CATALOGUE_RESPONSE_1_0_15.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T58.xslt",
@@ -480,7 +488,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CREDITNOTE_2_0_17,
                                                                            "EHF Creditnote " +
                                                                                                       VID_EHF_CREDITNOTE_2_0_17.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T14.xslt",
@@ -493,7 +501,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_DESPATCH_ADVICE_1_0_12,
                                                                            "EHF Despatch Advice " +
                                                                                                            VID_EHF_DESPATCH_ADVICE_1_0_12.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T16.xslt",
@@ -506,7 +514,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_INVOICE_2_0_17,
                                                                            "EHF Invoice " +
                                                                                                    VID_EHF_INVOICE_2_0_17.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T10.xslt",
@@ -519,7 +527,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_1_0_13,
                                                                            "EHF Ordering " +
                                                                                                  VID_EHF_ORDER_1_0_13.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T01.xslt",
@@ -532,7 +540,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_AGREEMENT_1_0_4,
                                                                            "EHF Order Agreement " +
                                                                                                           VID_EHF_ORDER_AGREEMENT_1_0_4.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T110.xslt",
@@ -545,7 +553,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_RESPONSE_1_0_13,
                                                                            "EHF Order Response " +
                                                                                                           VID_EHF_ORDER_RESPONSE_1_0_13.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T76.xslt",
@@ -558,7 +566,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_PUNCH_OUT_1_0_3,
                                                                            "EHF Punch Out " +
                                                                                                     VID_EHF_PUNCH_OUT_1_0_3.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_201912 +
                                                                                                                "BIIRULES-UBL-T77.xslt",
diff --git a/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3.java b/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3.java
index 13ed3ee8..d88c9e75 100644
--- a/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3.java
+++ b/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -86,6 +88,12 @@ private static ClassLoader _getCL ()
     return EHFValidationG3.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard EHF validation execution sets to the provided
    * registry.
@@ -107,7 +115,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_CANCELLATION_300,
                                                                            "EHF Advanced Order Cancellation " +
                                                                                                                     VID_EHF_ADVANCED_ORDER_CANCELLATION_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderCancellationXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-CANCELLATION.xslt",
@@ -115,7 +123,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_CHANGE_300,
                                                                            "EHF Advanced Order Change " +
                                                                                                               VID_EHF_ADVANCED_ORDER_CHANGE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderChangeXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-CHANGE.xslt",
@@ -123,7 +131,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_INITIATION_300,
                                                                            "EHF Advanced Order Initiation " +
                                                                                                                   VID_EHF_ADVANCED_ORDER_INITIATION_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-INITIATION.xslt",
@@ -131,7 +139,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_RESPONSE_300,
                                                                            "EHF Advanced Order Response " +
                                                                                                                 VID_EHF_ADVANCED_ORDER_RESPONSE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-RESPONSE.xslt",
@@ -139,7 +147,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_300,
                                                                            "EHF Catalogue " +
                                                                                                   VID_EHF_CATALOGUE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "catalogue-3.0/EHF-CATALOGUE-3.0.xslt",
@@ -147,7 +155,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_RESPONSE_300,
                                                                            "EHF Catalogue Response " +
                                                                                                            VID_EHF_CATALOGUE_RESPONSE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "catalogue-3.0/EHF-CATALOGUE-RESPONSE-3.0.xslt",
@@ -155,7 +163,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_DESPATCH_ADVICE_300,
                                                                            "EHF Despatch Advice " +
                                                                                                         VID_EHF_DESPATCH_ADVICE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "despatch-advice-3.0/EHF-DESPATCH-ADVICE-3.0.xslt",
@@ -163,7 +171,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_FORWARD_BILLING_INVOICE_300,
                                                                            "EHF Forward Billing Invoice " +
                                                                                                                 VID_EHF_FORWARD_BILLING_INVOICE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "forward-billing-3.0/FORWARD-BILLING-CEN-EN16931-UBL.xslt",
@@ -174,7 +182,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_FORWARD_BILLING_CREDIT_NOTE_300,
                                                                            "EHF Forward Billing Credit Note " +
                                                                                                                     VID_EHF_FORWARD_BILLING_CREDIT_NOTE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "forward-billing-3.0/FORWARD-BILLING-CEN-EN16931-UBL.xslt",
@@ -185,7 +193,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_AGREEMENT_300,
                                                                            "EHF Order Agreement " +
                                                                                                         VID_EHF_ORDER_AGREEMENT_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "order-agreement-3.0/EHF-ORDER-AGREEMENT-3.0.xslt",
@@ -193,7 +201,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_300,
                                                                            "EHF Order " +
                                                                                               VID_EHF_ORDER_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "ordering-3.0/EHF-ORDER-3.0.xslt",
@@ -201,7 +209,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_RESPONSE_300,
                                                                            "EHF Order Response " +
                                                                                                        VID_EHF_ORDER_RESPONSE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "ordering-3.0/EHF-ORDER-RESPONSE-3.0.xslt",
@@ -209,14 +217,14 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_PAYMENT_REQUEST_300,
                                                                            "EHF Payment Request " +
                                                                                                         VID_EHF_PAYMENT_REQUEST_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "payment-request-3.0/EHF-P07-3.0-PAYMENT-REQUEST-3.0.xslt"))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_PUNCH_OUT_300,
                                                                            "EHF Punch Out " +
                                                                                                   VID_EHF_PUNCH_OUT_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "punch-out-3.0/EHF-PUNCH-OUT-3.0.xslt",
@@ -224,7 +232,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_REMINDER_300,
                                                                            "EHF Reminder " +
                                                                                                  VID_EHF_REMINDER_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "reminder-3.0/REMINDER-CEN-EN16931-UBL.xslt",
diff --git a/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3_2023_02.java b/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3_2023_02.java
index 9a2d41d3..c3ef1f67 100644
--- a/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3_2023_02.java
+++ b/phive-rules-ehf/src/main/java/com/helger/phive/ehf/EHFValidationG3_2023_02.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -92,6 +94,12 @@ private static ClassLoader _getCL ()
     return EHFValidationG3_2023_02.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard EHF validation execution sets to the provided
    * registry.
@@ -113,7 +121,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_CANCELLATION_303,
                                                                            "EHF Advanced Order Cancellation " +
                                                                                                                     VID_EHF_ADVANCED_ORDER_CANCELLATION_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderCancellationXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-CANCELLATION.xslt",
@@ -121,7 +129,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_CHANGE_303,
                                                                            "EHF Advanced Order Change " +
                                                                                                               VID_EHF_ADVANCED_ORDER_CHANGE_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderChangeXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-CHANGE.xslt",
@@ -129,7 +137,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_INITIATION_303,
                                                                            "EHF Advanced Order Initiation " +
                                                                                                                   VID_EHF_ADVANCED_ORDER_INITIATION_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-INITIATION.xslt",
@@ -137,7 +145,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ADVANCED_ORDER_RESPONSE_303,
                                                                            "EHF Advanced Order Response " +
                                                                                                                 VID_EHF_ADVANCED_ORDER_RESPONSE_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "advanced-ordering-3.0/EHF-P09-3.0-ORDER-RESPONSE.xslt",
@@ -145,7 +153,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_303,
                                                                            "EHF Catalogue " +
                                                                                                   VID_EHF_CATALOGUE_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "catalogue-3.0/EHF-CATALOGUE-3.0.xslt",
@@ -153,7 +161,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_CATALOGUE_RESPONSE_303,
                                                                            "EHF Catalogue Response " +
                                                                                                            VID_EHF_CATALOGUE_RESPONSE_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "catalogue-3.0/EHF-CATALOGUE-RESPONSE-3.0.xslt",
@@ -161,7 +169,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_DESPATCH_ADVICE_302,
                                                                            "EHF Despatch Advice " +
                                                                                                         VID_EHF_DESPATCH_ADVICE_302.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "despatch-advice-3.0/EHF-DESPATCH-ADVICE-3.0.xslt",
@@ -169,7 +177,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_FORWARD_BILLING_INVOICE_303,
                                                                            "EHF Forward Billing Invoice " +
                                                                                                                 VID_EHF_FORWARD_BILLING_INVOICE_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "forward-billing-3.0/FORWARD-BILLING-CEN-EN16931-UBL.xslt",
@@ -180,7 +188,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_FORWARD_BILLING_CREDIT_NOTE_303,
                                                                            "EHF Forward Billing Credit Note " +
                                                                                                                     VID_EHF_FORWARD_BILLING_CREDIT_NOTE_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "forward-billing-3.0/FORWARD-BILLING-CEN-EN16931-UBL.xslt",
@@ -191,7 +199,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_AGREEMENT_303,
                                                                            "EHF Order Agreement " +
                                                                                                         VID_EHF_ORDER_AGREEMENT_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "order-agreement-3.0/EHF-ORDER-AGREEMENT-3.0.xslt",
@@ -199,7 +207,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_303,
                                                                            "EHF Order " +
                                                                                               VID_EHF_ORDER_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "ordering-3.0/EHF-ORDER-3.0.xslt",
@@ -207,7 +215,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_ORDER_RESPONSE_303,
                                                                            "EHF Order Response " +
                                                                                                        VID_EHF_ORDER_RESPONSE_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "ordering-3.0/EHF-ORDER-RESPONSE-3.0.xslt",
@@ -215,14 +223,14 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_PAYMENT_REQUEST_302,
                                                                            "EHF Payment Request " +
                                                                                                         VID_EHF_PAYMENT_REQUEST_302.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "payment-request-3.0/EHF-P07-3.0-PAYMENT-REQUEST-3.0.xslt"))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_PUNCH_OUT_303,
                                                                            "EHF Punch Out " +
                                                                                                   VID_EHF_PUNCH_OUT_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "punch-out-3.0/EHF-PUNCH-OUT-3.0.xslt",
@@ -230,7 +238,7 @@ public static void initEHF (@Nonnull final IValidationExecutorSetRegistry <IVali
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_EHF_REMINDER_303,
                                                                            "EHF Reminder " +
                                                                                                  VID_EHF_REMINDER_303.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (sXSLT +
                                                                                                                "reminder-3.0/REMINDER-CEN-EN16931-UBL.xslt",
diff --git a/phive-rules-en16931/src/main/java/com/helger/phive/en16931/EN16931Validation.java b/phive-rules-en16931/src/main/java/com/helger/phive/en16931/EN16931Validation.java
index d6a5edd2..9267bfd1 100644
--- a/phive-rules-en16931/src/main/java/com/helger/phive/en16931/EN16931Validation.java
+++ b/phive-rules-en16931/src/main/java/com/helger/phive/en16931/EN16931Validation.java
@@ -27,6 +27,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -344,6 +346,12 @@ private static ClassLoader _getCL ()
   private EN16931Validation ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard EN 16931 validation execution sets to the provided
    * registry.
@@ -367,133 +375,133 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_100,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_100.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_100_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_110,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_110.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_110_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_120,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_120.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_120_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_121,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_121.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_121_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_123,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_123.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_123_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_130,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_130.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_130_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_131,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_131.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_131_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_132,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_132.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_132_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_133,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_133.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_133_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_134,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_134.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_134_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_135,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_135.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_135_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_136,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_136.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_136_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_136A,
                                                                              "EN 16931 CII " +
                                                                                            VID_CII_136A.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_136A_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_137,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_137.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_137_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_138,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_138.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_138_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_139,
                                                                              "EN 16931 CII " +
                                                                                           VID_CII_139.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_139_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_1310,
                                                                              "EN 16931 CII " +
                                                                                            VID_CII_1310.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_1310_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_1311,
                                                                              "EN 16931 CII " +
                                                                                            VID_CII_1311.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_1311_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_CII_1312,
                                                                              "EN 16931 CII " +
                                                                                            VID_CII_1312.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_CII_1312_XSLT,
                                                                                                                       CIID16BNamespaceContext.getInstance ())));
@@ -505,14 +513,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_100,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_100.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_100_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_100,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_100.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_110_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -521,14 +529,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_110,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_110.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_110_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_110,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_110.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_110_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -537,14 +545,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_120,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_120.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_120_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_120,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_120.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_120_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -553,14 +561,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_121,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_121.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_121_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_121,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_121.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_121_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -569,14 +577,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_123,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_123.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_123_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_123,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_123.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_123_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -585,14 +593,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_130,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_130.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_130_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_130,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_130.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_130_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -601,14 +609,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_131,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_131.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_131_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_131,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_131.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_131_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -617,14 +625,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_132,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_132.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_132_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_132,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_132.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_132_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -633,14 +641,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_133,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_133.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_133_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_133,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_133.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_133_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -649,14 +657,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_134,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_134.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_134_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_134,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_134.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_134_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -665,14 +673,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_135,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_135.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_135_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_135,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_135.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_135_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -681,14 +689,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_136,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_136.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_136_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_136,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_136.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_136_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -697,14 +705,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_136A,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                    VID_UBL_INVOICE_136A.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_136A_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_136A,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                        VID_UBL_CREDIT_NOTE_136A.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_136A_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -713,14 +721,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_137,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_137.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_137_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_137,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_137.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_137_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -729,14 +737,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_138,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_138.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_138_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_138,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_138.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_138_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -745,14 +753,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_139,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                   VID_UBL_INVOICE_139.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_139_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_139,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                       VID_UBL_CREDIT_NOTE_139.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_139_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -761,14 +769,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_1310,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                    VID_UBL_INVOICE_1310.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_1310_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_1310,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                        VID_UBL_CREDIT_NOTE_1310.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_1310_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -777,14 +785,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_1311,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                    VID_UBL_INVOICE_1311.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_1311_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_1311,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                        VID_UBL_CREDIT_NOTE_1311.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_1311_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
@@ -793,14 +801,14 @@ public static void initEN16931 (@Nonnull final IValidationExecutorSetRegistry <I
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_INVOICE_1312,
                                                                              "EN 16931 UBL Invoice " +
                                                                                                    VID_UBL_INVOICE_1312.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_1312_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_CREDIT_NOTE_1312,
                                                                              "EN 16931 UBL Credit Note " +
                                                                                                        VID_UBL_CREDIT_NOTE_1312.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_UBL_1312_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())));
diff --git a/phive-rules-energieefactuur/src/main/java/com/helger/phive/energieefactuur/EnergieEFactuurValidation.java b/phive-rules-energieefactuur/src/main/java/com/helger/phive/energieefactuur/EnergieEFactuurValidation.java
index e74c7bac..38693189 100644
--- a/phive-rules-energieefactuur/src/main/java/com/helger/phive/energieefactuur/EnergieEFactuurValidation.java
+++ b/phive-rules-energieefactuur/src/main/java/com/helger/phive/energieefactuur/EnergieEFactuurValidation.java
@@ -28,6 +28,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.simplerinvoicing.SimplerInvoicingValidation;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
@@ -86,6 +88,12 @@ private static ClassLoader _getCL ()
   private EnergieEFactuurValidation ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard Energie eFactuur validation execution sets to the
    * provided registry.
@@ -120,7 +128,7 @@ public static void initEnergieEFactuur (@Nonnull final IValidationExecutorSetReg
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_ENERGIE_EFACTUUR_1_0_0,
                                                                              "Energie eFactuur " +
                                                                                                          VID_ENERGIE_EFACTUUR_1_0_0.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorXSDPartial.create (SEEF_EXT_XSD_1_0_0,
                                                                                                                   XSDPartialContext.create (aXE100,
@@ -144,7 +152,7 @@ public static void initEnergieEFactuur (@Nonnull final IValidationExecutorSetReg
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_ENERGIE_EFACTUUR_1_0_1,
                                                                              "Energie eFactuur " +
                                                                                                          VID_ENERGIE_EFACTUUR_1_0_1.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorXSDPartial.create (SEEF_EXT_XSD_1_0_1,
                                                                                                                   XSDPartialContext.create (aXE101,
@@ -168,7 +176,7 @@ public static void initEnergieEFactuur (@Nonnull final IValidationExecutorSetReg
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_ENERGIE_EFACTUUR_2_0_0,
                                                                              "Energie eFactuur " +
                                                                                                          VID_ENERGIE_EFACTUUR_2_0_0.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorXSDPartial.create (SEEF_EXT_XSD_2_0_0,
                                                                                                                   XSDPartialContext.create (aXE200,
@@ -192,7 +200,7 @@ public static void initEnergieEFactuur (@Nonnull final IValidationExecutorSetReg
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_ENERGIE_EFACTUUR_3_0_0,
                                                                              "Energie eFactuur " +
                                                                                                          VID_ENERGIE_EFACTUUR_3_0_0.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorXSDPartial.create (SEEF_EXT_XSD_3_0_0,
                                                                                                                   XSDPartialContext.create (aXE300,
@@ -216,7 +224,7 @@ public static void initEnergieEFactuur (@Nonnull final IValidationExecutorSetReg
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_ENERGIE_EFACTUUR_3_1_0,
                                                                              "Energie eFactuur " +
                                                                                                          VID_ENERGIE_EFACTUUR_3_1_0.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorXSDPartial.create (SEEF_EXT_XSD_3_1_0,
                                                                                                                   XSDPartialContext.create (aXE310,
diff --git a/phive-rules-facturae/src/main/java/com/helger/phive/facturae/FacturaeValidation.java b/phive-rules-facturae/src/main/java/com/helger/phive/facturae/FacturaeValidation.java
index dcc9acc6..86fbf450 100644
--- a/phive-rules-facturae/src/main/java/com/helger/phive/facturae/FacturaeValidation.java
+++ b/phive-rules-facturae/src/main/java/com/helger/phive/facturae/FacturaeValidation.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
 import com.helger.xsds.xmldsig.CXMLDSig;
@@ -55,6 +57,12 @@ private static ClassLoader _getCL ()
     return FacturaeValidation.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard Facturae validation execution sets to the provided
    * registry.
@@ -73,35 +81,35 @@ public static void initFacturae (@Nonnull final IValidationExecutorSetRegistry <
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FACTURAE_300,
                                                                            "Facturae " +
                                                                                              VID_FACTURAE_300.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CXMLDSig.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/Facturae30.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FACTURAE_310,
                                                                            "Facturae " +
                                                                                              VID_FACTURAE_310.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CXMLDSig.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/Facturaev31.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FACTURAE_320,
                                                                            "Facturae " +
                                                                                              VID_FACTURAE_320.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CXMLDSig.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/Facturaev3_2.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FACTURAE_321,
                                                                            "Facturae " +
                                                                                              VID_FACTURAE_321.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CXMLDSig.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/Facturaev3_2_1.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FACTURAE_322,
                                                                            "Facturae " +
                                                                                              VID_FACTURAE_322.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CXMLDSig.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/Facturaev3_2_2.xsd",
                                                                                                                                 _getCL ()))));
diff --git a/phive-rules-fatturapa/src/main/java/com/helger/phive/fatturapa/FatturaPAValidation.java b/phive-rules-fatturapa/src/main/java/com/helger/phive/fatturapa/FatturaPAValidation.java
index 1712de81..3fe0ff76 100644
--- a/phive-rules-fatturapa/src/main/java/com/helger/phive/fatturapa/FatturaPAValidation.java
+++ b/phive-rules-fatturapa/src/main/java/com/helger/phive/fatturapa/FatturaPAValidation.java
@@ -24,6 +24,8 @@
 import com.helger.fatturapa.CFatturaPA;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
 
@@ -44,6 +46,12 @@ public final class FatturaPAValidation
   private FatturaPAValidation ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard fatturaPA validation execution sets to the provided
    * registry.
@@ -62,17 +70,17 @@ public static void initFatturaPA (@Nonnull final IValidationExecutorSetRegistry
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FATTURAPA_120,
                                                                            "fatturaPA " +
                                                                                               VID_FATTURAPA_120.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CFatturaPA.getAllXSDFatturaPA120 ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FATTURAPA_121,
                                                                            "fatturaPA " +
                                                                                               VID_FATTURAPA_121.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CFatturaPA.getAllXSDFatturaPA121 ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FATTURAPA_122,
                                                                            "fatturaPA " +
                                                                                               VID_FATTURAPA_122.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CFatturaPA.getAllXSDFatturaPA122 ())));
   }
 }
diff --git a/phive-rules-finvoice/src/main/java/com/helger/phive/finvoice/FinvoiceValidation.java b/phive-rules-finvoice/src/main/java/com/helger/phive/finvoice/FinvoiceValidation.java
index e6ae1782..177f29ef 100644
--- a/phive-rules-finvoice/src/main/java/com/helger/phive/finvoice/FinvoiceValidation.java
+++ b/phive-rules-finvoice/src/main/java/com/helger/phive/finvoice/FinvoiceValidation.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
 
@@ -51,6 +53,12 @@ private static ClassLoader _getCL ()
     return FinvoiceValidation.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard Finvoice validation execution sets to the provided
    * registry.
@@ -70,28 +78,28 @@ public static void initFinvoice (@Nonnull final IValidationExecutorSetRegistry <
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FINVOICE_13,
                                                                            "Finvoice " +
                                                                                             VID_FINVOICE_13.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource (sPrefix +
                                                                                                                                 "Finvoice1.3.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FINVOICE_20,
                                                                            "Finvoice " +
                                                                                             VID_FINVOICE_20.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource (sPrefix +
                                                                                                                                 "Finvoice2.0.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FINVOICE_201,
                                                                            "Finvoice " +
                                                                                              VID_FINVOICE_201.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource (sPrefix +
                                                                                                                                 "Finvoice2.01.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_FINVOICE_30,
                                                                            "Finvoice " +
                                                                                             VID_FINVOICE_30.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource (sPrefix +
                                                                                                                                 "Finvoice3.0.xsd",
                                                                                                                                 _getCL ()))));
diff --git a/phive-rules-isdoc/src/main/java/com/helger/phive/isdoc/ISDOCValidation.java b/phive-rules-isdoc/src/main/java/com/helger/phive/isdoc/ISDOCValidation.java
index c95286df..0ef950d3 100644
--- a/phive-rules-isdoc/src/main/java/com/helger/phive/isdoc/ISDOCValidation.java
+++ b/phive-rules-isdoc/src/main/java/com/helger/phive/isdoc/ISDOCValidation.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -67,6 +69,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, NS_CTX.getClone ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard ISDOC validation execution sets to the provided
    * registry.
@@ -83,14 +91,14 @@ public static void initISDOC (@Nonnull final IValidationExecutorSetRegistry <IVa
 
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_ISDOC_601,
                                                                            "ISDOC " + VID_ISDOC_601.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CXMLDSig.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/isdoc/6.0.1/isdoc-invoice-dsig-6.0.1.xsd",
                                                                                                                                 _getCL ())),
                                                                            _createXSLT (new ClassPathResource ("/external/schematron/isdoc/6.0.1/isdoc-6.0.1.xslt"))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_ISDOC_602,
                                                                            "ISDOC " + VID_ISDOC_602.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CXMLDSig.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/isdoc/6.0.2/isdoc-invoice-dsig-6.0.2.xsd",
                                                                                                                                 _getCL ())),
diff --git a/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLLegacyValidation.java b/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLLegacyValidation.java
index 440c20b4..a040b40a 100644
--- a/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLLegacyValidation.java
+++ b/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLLegacyValidation.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -96,6 +98,12 @@ private static ValidationExecutorSchematron _createOIOUBL (@Nonnull final IReada
     return ValidationExecutorSchematron.createOIOUBL (aRes, UBL20NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all legacy OIOUBL validation execution sets to the provided
    * registry.
@@ -118,7 +126,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_APPLICATION_RESPONSE,
                                                                              "OIOUBL Application Response " +
                                                                                                               VID_OIOUBL_APPLICATION_RESPONSE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllApplicationResponseXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_ApplicationResponse_Schematron.xsl",
@@ -126,7 +134,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE,
                                                                              "OIOUBL Catalogue " +
                                                                                                    VID_OIOUBL_CATALOGUE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_Catalogue_Schematron.xsl",
@@ -134,7 +142,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_DELETION,
                                                                              "OIOUBL Catalogue Deletion " +
                                                                                                             VID_OIOUBL_CATALOGUE_DELETION.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueDeletionXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_CatalogueDeletion_Schematron.xsl",
@@ -142,7 +150,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE,
                                                                              "OIOUBL Catalogue Item Specification Update " +
                                                                                                                              VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_CatalogueItemSpecificationUpdate_Schematron.xsl",
@@ -150,7 +158,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_PRICING_UPDATE,
                                                                              "OIOUBL Catalogue Pricing Update " +
                                                                                                                   VID_OIOUBL_CATALOGUE_PRICING_UPDATE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllCataloguePricingUpdateXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_CataloguePricingUpdate_Schematron.xsl",
@@ -158,7 +166,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_REQUEST,
                                                                              "OIOUBL Catalogue Request " +
                                                                                                            VID_OIOUBL_CATALOGUE_REQUEST.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueRequestXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_CatalogueRequest_Schematron.xsl",
@@ -166,7 +174,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CREDIT_NOTE,
                                                                              "OIOUBL Credit Note " +
                                                                                                      VID_OIOUBL_CREDIT_NOTE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllCreditNoteXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_CreditNote_Schematron.xsl",
@@ -174,7 +182,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_INVOICE,
                                                                              "OIOUBL Invoice " +
                                                                                                  VID_OIOUBL_INVOICE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllInvoiceXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_Invoice_Schematron.xsl",
@@ -182,7 +190,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER,
                                                                              "OIOUBL Order " +
                                                                                                VID_OIOUBL_ORDER.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_Order_Schematron.xsl",
@@ -190,7 +198,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CANCELLATION,
                                                                              "OIOUBL Order Cancellation " +
                                                                                                             VID_OIOUBL_ORDER_CANCELLATION.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderCancellationXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_OrderCancellation_Schematron.xsl",
@@ -198,7 +206,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CHANGE,
                                                                              "OIOUBL Order Change " +
                                                                                                       VID_OIOUBL_ORDER_CHANGE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderChangeXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_OrderChange_Schematron.xsl",
@@ -206,7 +214,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE,
                                                                              "OIOUBL Order Response " +
                                                                                                         VID_OIOUBL_ORDER_RESPONSE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderResponseXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_OrderResponse_Schematron.xsl",
@@ -214,7 +222,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE_SIMPLE,
                                                                              "OIOUBL Order Response Simple " +
                                                                                                                VID_OIOUBL_ORDER_RESPONSE_SIMPLE.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderResponseSimpleXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_OrderResponseSimple_Schematron.xsl",
@@ -222,7 +230,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_REMINDER,
                                                                              "OIOUBL Reminder " +
                                                                                                   VID_OIOUBL_REMINDER.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllReminderXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_Reminder_Schematron.xsl",
@@ -230,7 +238,7 @@ public static void initLegacyOIOUBL (@Nonnull final IValidationExecutorSetRegist
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_STATEMENT,
                                                                              "OIOUBL Statement " +
                                                                                                    VID_OIOUBL_STATEMENT.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL20Marshaller.getAllStatementXSDs ()),
                                                                              _createOIOUBL (new ClassPathResource (sPath202 +
                                                                                                                    "OIOUBL_Statement_Schematron.xsl",
diff --git a/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLValidation.java b/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLValidation.java
index 3f7b08d9..f69585d4 100644
--- a/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLValidation.java
+++ b/phive-rules-oioubl/src/main/java/com/helger/phive/oioubl/OIOUBLValidation.java
@@ -27,6 +27,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -197,6 +199,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL20NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard OIOUBL validation execution sets to the provided
    * registry.
@@ -213,6 +221,8 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
 
     final boolean bDeprecated = true;
     final boolean bNotDeprecated = false;
+
+    // MUST be UBL 2.0 as an include refers to a file only available in UBL 2.0
     final ICommonsList <ClassPathResource> XSD_UTITLITY_STATEMENT = new CommonsArrayList <> (CUBL20.XSD_CODELIST_UNIT_CODE,
                                                                                              CUBL20.XSD_CODELIST_MIME_MEDIA_TYPE_CODE,
                                                                                              CUBL20.XSD_CODELIST_CURRENCY_CODE,
@@ -232,7 +242,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_APPLICATION_RESPONSE_1_12_3,
                                                                              "OIOUBL Application Response " +
                                                                                                                      VID_OIOUBL_APPLICATION_RESPONSE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_ApplicationResponse_Schematron.xslt",
@@ -240,7 +250,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_1_12_3,
                                                                              "OIOUBL Catalogue " +
                                                                                                           VID_OIOUBL_CATALOGUE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Catalogue_Schematron.xslt",
@@ -248,7 +258,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_DELETION_1_12_3,
                                                                              "OIOUBL Catalogue Deletion " +
                                                                                                                    VID_OIOUBL_CATALOGUE_DELETION_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueDeletionXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueDeletion_Schematron.xslt",
@@ -256,7 +266,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE_1_12_3,
                                                                              "OIOUBL Catalogue Item Specification Update " +
                                                                                                                                     VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueItemSpecificationUpdate_Schematron.xslt",
@@ -264,7 +274,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_PRICING_UPDATE_1_12_3,
                                                                              "OIOUBL Catalogue Pricing Update " +
                                                                                                                          VID_OIOUBL_CATALOGUE_PRICING_UPDATE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCataloguePricingUpdateXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CataloguePricingUpdate_Schematron.xslt",
@@ -272,7 +282,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_REQUEST_1_12_3,
                                                                              "OIOUBL Catalogue Request " +
                                                                                                                   VID_OIOUBL_CATALOGUE_REQUEST_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueRequestXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueRequest_Schematron.xslt",
@@ -280,7 +290,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CREDIT_NOTE_1_12_3,
                                                                              "OIOUBL Credit Note " +
                                                                                                             VID_OIOUBL_CREDIT_NOTE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CreditNote_Schematron.xslt",
@@ -288,7 +298,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_INVOICE_1_12_3,
                                                                              "OIOUBL Invoice " +
                                                                                                         VID_OIOUBL_INVOICE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Invoice_Schematron.xslt",
@@ -296,7 +306,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_1_12_3,
                                                                              "OIOUBL Order " +
                                                                                                       VID_OIOUBL_ORDER_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Order_Schematron.xslt",
@@ -304,7 +314,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CANCELLATION_1_12_3,
                                                                              "OIOUBL Order Cancellation " +
                                                                                                                    VID_OIOUBL_ORDER_CANCELLATION_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderCancellationXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderCancellation_Schematron.xslt",
@@ -312,7 +322,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CHANGE_1_12_3,
                                                                              "OIOUBL Order Change " +
                                                                                                              VID_OIOUBL_ORDER_CHANGE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderChangeXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderChange_Schematron.xslt",
@@ -320,7 +330,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE_1_12_3,
                                                                              "OIOUBL Order Response " +
                                                                                                                VID_OIOUBL_ORDER_RESPONSE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderResponse_Schematron.xslt",
@@ -328,7 +338,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE_SIMPLE_1_12_3,
                                                                              "OIOUBL Order Response Simple " +
                                                                                                                       VID_OIOUBL_ORDER_RESPONSE_SIMPLE_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseSimpleXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderResponseSimple_Schematron.xslt",
@@ -336,7 +346,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_REMINDER_1_12_3,
                                                                              "OIOUBL Reminder " +
                                                                                                          VID_OIOUBL_REMINDER_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllReminderXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Reminder_Schematron.xslt",
@@ -344,7 +354,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_STATEMENT_1_12_3,
                                                                              "OIOUBL Statement " +
                                                                                                           VID_OIOUBL_STATEMENT_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllStatementXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Statement_Schematron.xslt",
@@ -353,7 +363,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_UTILITY_STATEMENT_1_12_3,
                                                                              "OIOUBL Utility Statement " +
                                                                                                                   VID_OIOUBL_UTILITY_STATEMENT_1_12_3.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (XSD_UTITLITY_STATEMENT),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_UtilityStatement_Schematron.xslt",
@@ -366,7 +376,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_APPLICATION_RESPONSE_1_13_0,
                                                                              "OIOUBL Application Response " +
                                                                                                                      VID_OIOUBL_APPLICATION_RESPONSE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_ApplicationResponse_Schematron.xslt",
@@ -374,7 +384,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_1_13_0,
                                                                              "OIOUBL Catalogue " +
                                                                                                           VID_OIOUBL_CATALOGUE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Catalogue_Schematron.xslt",
@@ -382,7 +392,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_DELETION_1_13_0,
                                                                              "OIOUBL Catalogue Deletion " +
                                                                                                                    VID_OIOUBL_CATALOGUE_DELETION_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueDeletionXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueDeletion_Schematron.xslt",
@@ -390,7 +400,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE_1_13_0,
                                                                              "OIOUBL Catalogue Item Specification Update " +
                                                                                                                                     VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueItemSpecificationUpdate_Schematron.xslt",
@@ -398,7 +408,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_PRICING_UPDATE_1_13_0,
                                                                              "OIOUBL Catalogue Pricing Update " +
                                                                                                                          VID_OIOUBL_CATALOGUE_PRICING_UPDATE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCataloguePricingUpdateXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CataloguePricingUpdate_Schematron.xslt",
@@ -406,7 +416,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_REQUEST_1_13_0,
                                                                              "OIOUBL Catalogue Request " +
                                                                                                                   VID_OIOUBL_CATALOGUE_REQUEST_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueRequestXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueRequest_Schematron.xslt",
@@ -414,7 +424,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CREDIT_NOTE_1_13_0,
                                                                              "OIOUBL Credit Note " +
                                                                                                             VID_OIOUBL_CREDIT_NOTE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CreditNote_Schematron.xslt",
@@ -422,7 +432,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_INVOICE_1_13_0,
                                                                              "OIOUBL Invoice " +
                                                                                                         VID_OIOUBL_INVOICE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Invoice_Schematron.xslt",
@@ -430,7 +440,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_1_13_0,
                                                                              "OIOUBL Order " +
                                                                                                       VID_OIOUBL_ORDER_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Order_Schematron.xslt",
@@ -438,7 +448,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CANCELLATION_1_13_0,
                                                                              "OIOUBL Order Cancellation " +
                                                                                                                    VID_OIOUBL_ORDER_CANCELLATION_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderCancellationXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderCancellation_Schematron.xslt",
@@ -446,7 +456,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CHANGE_1_13_0,
                                                                              "OIOUBL Order Change " +
                                                                                                              VID_OIOUBL_ORDER_CHANGE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderChangeXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderChange_Schematron.xslt",
@@ -454,7 +464,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE_1_13_0,
                                                                              "OIOUBL Order Response " +
                                                                                                                VID_OIOUBL_ORDER_RESPONSE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderResponse_Schematron.xslt",
@@ -462,7 +472,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE_SIMPLE_1_13_0,
                                                                              "OIOUBL Order Response Simple " +
                                                                                                                       VID_OIOUBL_ORDER_RESPONSE_SIMPLE_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseSimpleXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderResponseSimple_Schematron.xslt",
@@ -470,7 +480,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_REMINDER_1_13_0,
                                                                              "OIOUBL Reminder " +
                                                                                                          VID_OIOUBL_REMINDER_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllReminderXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Reminder_Schematron.xslt",
@@ -478,7 +488,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_STATEMENT_1_13_0,
                                                                              "OIOUBL Statement " +
                                                                                                           VID_OIOUBL_STATEMENT_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllStatementXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Statement_Schematron.xslt",
@@ -487,7 +497,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_UTILITY_STATEMENT_1_13_0,
                                                                              "OIOUBL Utility Statement " +
                                                                                                                   VID_OIOUBL_UTILITY_STATEMENT_1_13_0.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (XSD_UTITLITY_STATEMENT),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_UtilityStatement_Schematron.xslt",
@@ -500,7 +510,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_APPLICATION_RESPONSE_1_13_2,
                                                                              "OIOUBL Application Response " +
                                                                                                                      VID_OIOUBL_APPLICATION_RESPONSE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_ApplicationResponse_Schematron.xslt",
@@ -508,7 +518,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_1_13_2,
                                                                              "OIOUBL Catalogue " +
                                                                                                           VID_OIOUBL_CATALOGUE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Catalogue_Schematron.xslt",
@@ -516,7 +526,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_DELETION_1_13_2,
                                                                              "OIOUBL Catalogue Deletion " +
                                                                                                                    VID_OIOUBL_CATALOGUE_DELETION_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueDeletionXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueDeletion_Schematron.xslt",
@@ -524,7 +534,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE_1_13_2,
                                                                              "OIOUBL Catalogue Item Specification Update " +
                                                                                                                                     VID_OIOUBL_CATALOGUE_ITEM_SPECIFICATION_UPDATE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueItemSpecificationUpdate_Schematron.xslt",
@@ -532,7 +542,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_PRICING_UPDATE_1_13_2,
                                                                              "OIOUBL Catalogue Pricing Update " +
                                                                                                                          VID_OIOUBL_CATALOGUE_PRICING_UPDATE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCataloguePricingUpdateXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CataloguePricingUpdate_Schematron.xslt",
@@ -540,7 +550,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CATALOGUE_REQUEST_1_13_2,
                                                                              "OIOUBL Catalogue Request " +
                                                                                                                   VID_OIOUBL_CATALOGUE_REQUEST_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueRequestXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CatalogueRequest_Schematron.xslt",
@@ -548,7 +558,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_CREDIT_NOTE_1_13_2,
                                                                              "OIOUBL Credit Note " +
                                                                                                             VID_OIOUBL_CREDIT_NOTE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_CreditNote_Schematron.xslt",
@@ -556,7 +566,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_INVOICE_1_13_2,
                                                                              "OIOUBL Invoice " +
                                                                                                         VID_OIOUBL_INVOICE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Invoice_Schematron.xslt",
@@ -564,7 +574,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_1_13_2,
                                                                              "OIOUBL Order " +
                                                                                                       VID_OIOUBL_ORDER_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Order_Schematron.xslt",
@@ -572,7 +582,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CANCELLATION_1_13_2,
                                                                              "OIOUBL Order Cancellation " +
                                                                                                                    VID_OIOUBL_ORDER_CANCELLATION_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderCancellationXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderCancellation_Schematron.xslt",
@@ -580,7 +590,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_CHANGE_1_13_2,
                                                                              "OIOUBL Order Change " +
                                                                                                              VID_OIOUBL_ORDER_CHANGE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderChangeXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderChange_Schematron.xslt",
@@ -588,7 +598,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE_1_13_2,
                                                                              "OIOUBL Order Response " +
                                                                                                                VID_OIOUBL_ORDER_RESPONSE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderResponse_Schematron.xslt",
@@ -596,7 +606,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_ORDER_RESPONSE_SIMPLE_1_13_2,
                                                                              "OIOUBL Order Response Simple " +
                                                                                                                       VID_OIOUBL_ORDER_RESPONSE_SIMPLE_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseSimpleXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_OrderResponseSimple_Schematron.xslt",
@@ -604,7 +614,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_REMINDER_1_13_2,
                                                                              "OIOUBL Reminder " +
                                                                                                          VID_OIOUBL_REMINDER_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllReminderXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Reminder_Schematron.xslt",
@@ -612,7 +622,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_STATEMENT_1_13_2,
                                                                              "OIOUBL Statement " +
                                                                                                           VID_OIOUBL_STATEMENT_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllStatementXSDs ()),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_Statement_Schematron.xslt",
@@ -621,7 +631,7 @@ public static void initOIOUBL (@Nonnull final IValidationExecutorSetRegistry <IV
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OIOUBL_UTILITY_STATEMENT_1_13_2,
                                                                              "OIOUBL Utility Statement " +
                                                                                                                   VID_OIOUBL_UTILITY_STATEMENT_1_13_2.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (XSD_UTITLITY_STATEMENT),
                                                                              _createXSLT (new ClassPathResource (sPath +
                                                                                                                  "OIOUBL_UtilityStatement_Schematron.xslt",
diff --git a/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_2_9.java b/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_2_9.java
index 3c6df296..01223084 100644
--- a/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_2_9.java
+++ b/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_2_9.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -72,6 +74,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, aNamespaceContext);
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -85,7 +93,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Despatch Advice" +
                                                                                                 sVersion +
                                                                                                 sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.despatchAdvice ()
@@ -94,7 +102,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order" +
                                                                                       sVersion +
                                                                                       sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.order ()
@@ -103,7 +111,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order Response" +
                                                                                                sVersion +
                                                                                                sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.orderResponse ()
diff --git a/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_3_0.java b/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_3_0.java
index 48686ae0..598a5b5c 100644
--- a/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_3_0.java
+++ b/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation2_3_0.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -32,11 +34,12 @@
 import com.helger.xml.namespace.IIterableNamespaceContext;
 
 /**
- * Italian Peppol validation artefacts based on BIS 3.0.6.
+ * Italian Peppol validation artefacts based on BIS 3.0.11.
  *
  * @author Philip Helger
  */
 @Immutable
+@Deprecated
 public final class PeppolItalyValidation2_3_0
 {
   // Standard resources
@@ -83,6 +86,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, aNamespaceContext);
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -90,13 +99,13 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     final String sVersion = " (" + VERSION_STR + ")";
     final String sAkaVersionBIS = " (for BIS 3.0.11)";
 
-    final boolean bNotDeprecated = false;
+    final boolean bDeprecated = true;
 
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_DESPATCH_ADVICE,
                                                                            "AGID Peppol Despatch Advice" +
                                                                                                 sVersion +
                                                                                                 sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.despatchAdvice ()
@@ -105,7 +114,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Invoice" +
                                                                                         sVersion +
                                                                                         sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.invoice ()
@@ -114,7 +123,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order" +
                                                                                       sVersion +
                                                                                       sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.order ()
@@ -123,7 +132,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order Agreement" +
                                                                                                 sVersion +
                                                                                                 sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.orderResponse ()
@@ -132,7 +141,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order Response" +
                                                                                                sVersion +
                                                                                                sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.orderResponse ()
diff --git a/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation3_0_2.java b/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation3_0_2.java
index 7bddc822..ffd33993 100644
--- a/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation3_0_2.java
+++ b/phive-rules-peppol-italy/src/main/java/com/helger/phive/peppol/italy/PeppolItalyValidation3_0_2.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -84,6 +86,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, aNamespaceContext);
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -97,7 +105,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Despatch Advice" +
                                                                                                 sVersion +
                                                                                                 sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.despatchAdvice ()
@@ -106,7 +114,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Invoice" +
                                                                                         sVersion +
                                                                                         sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.invoice ()
@@ -115,7 +123,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Credit Note" +
                                                                                             sVersion +
                                                                                             sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.creditNote ()
@@ -124,7 +132,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order" +
                                                                                       sVersion +
                                                                                       sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.order ()
@@ -133,7 +141,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order Agreement" +
                                                                                                 sVersion +
                                                                                                 sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.orderResponse ()
@@ -142,7 +150,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "AGID Peppol Order Response" +
                                                                                                sVersion +
                                                                                                sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE,
                                                                                         PeppolItalyValidation.createUBLNSContext (UBL21Marshaller.orderResponse ()
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyThirdpartyValidation.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyThirdpartyValidation.java
index 17cf023f..8846c676 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyThirdpartyValidation.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyThirdpartyValidation.java
@@ -24,6 +24,8 @@
 import com.helger.phive.api.executorset.IValidationExecutorSet;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -31,6 +33,7 @@
 import com.helger.ubl21.UBL21NamespaceContext;
 import com.helger.xml.namespace.MapBasedNamespaceContext;
 
+@Deprecated
 public class PeppolLegacyThirdpartyValidation
 {
   @Nonnull
@@ -64,7 +67,12 @@ private static ClassLoader _getCL ()
   private PeppolLegacyThirdpartyValidation ()
   {}
 
-  @SuppressWarnings ("deprecation")
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -91,7 +99,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     final IValidationExecutorSet <IValidationSourceXML> aVESInvoiceAT = ValidationExecutorSet.createDerived (aVESInvoice,
                                                                                                              VID_OPENPEPPOL_T10_AT_NAT,
                                                                                                              "OpenPeppol Invoice (Austria)",
-                                                                                                             bDeprecated,
+                                                                                                             _createStatus (bDeprecated),
                                                                                                              ValidationExecutorSchematron.createXSLT (INVOICE_AT_NAT,
                                                                                                                                                       sPreReqInvoice,
                                                                                                                                                       aNSCtxInvoice));
@@ -99,7 +107,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.createDerived (aVESInvoiceAT,
                                                                                   VID_OPENPEPPOL_T10_AT_GOV,
                                                                                   "OpenPeppol Invoice (Austrian Government)",
-                                                                                  bDeprecated,
+                                                                                  _createStatus (bDeprecated),
                                                                                   ValidationExecutorSchematron.createXSLT (INVOICE_AT_GOV,
                                                                                                                            sPreReqInvoice,
                                                                                                                            aNSCtxInvoice)));
@@ -108,7 +116,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     final IValidationExecutorSet <IValidationSourceXML> aVESCreditNoteAT = ValidationExecutorSet.createDerived (aVESCreditNote,
                                                                                                                 VID_OPENPEPPOL_T14_AT_NAT,
                                                                                                                 "OpenPeppol Credit Note (Austria)",
-                                                                                                                bDeprecated,
+                                                                                                                _createStatus (bDeprecated),
                                                                                                                 ValidationExecutorSchematron.createXSLT (CREDIT_NOTE_AT_NAT,
                                                                                                                                                          sPreReqCreditNote,
                                                                                                                                                          aNSCtxCreditNote));
@@ -116,7 +124,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.createDerived (aVESCreditNoteAT,
                                                                                   VID_OPENPEPPOL_T14_AT_GOV,
                                                                                   "OpenPeppol Credit Note (Austrian Government)",
-                                                                                  bDeprecated,
+                                                                                  _createStatus (bDeprecated),
                                                                                   ValidationExecutorSchematron.createXSLT (CREDIT_NOTE_AT_GOV,
                                                                                                                            sPreReqCreditNote,
                                                                                                                            aNSCtxCreditNote)));
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationAUNZ.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationAUNZ.java
index 68dd2535..5df887c3 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationAUNZ.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationAUNZ.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -38,6 +40,7 @@
  * @author Philip Helger
  */
 @Immutable
+@Deprecated
 public final class PeppolLegacyValidationAUNZ
 {
   @Nonnull
@@ -49,254 +52,197 @@ private static ClassLoader _getCL ()
   private static final String BASE_PATH = "external/schematron/peppol-aunz/";
 
   // 1.0.0
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_100 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.0");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_100 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.0");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_100 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.0");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_100 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.0");
 
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_100 = new ClassPathResource (BASE_PATH +
                                                                                                            "1.0.0/xslt/AUNZ-PEPPOL-SB-validation.xslt",
                                                                                                            _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_100 = new ClassPathResource (BASE_PATH +
                                                                                               "1.0.0/xslt/AUNZ-PEPPOL-validation.xslt",
                                                                                               _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_UBL_100 = new ClassPathResource (BASE_PATH +
                                                                                            "1.0.0/xslt/AUNZ-UBL-validation.xslt",
                                                                                            _getCL ());
 
   // 1.0.1
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_101 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.1");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_101 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.1");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_101 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.1");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_101 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.1");
 
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_101 = new ClassPathResource (BASE_PATH +
                                                                                                            "1.0.1/xslt/AUNZ-PEPPOL-SB-validation.xslt",
                                                                                                            _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_101 = new ClassPathResource (BASE_PATH +
                                                                                               "1.0.1/xslt/AUNZ-PEPPOL-validation.xslt",
                                                                                               _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_UBL_101 = new ClassPathResource (BASE_PATH +
                                                                                            "1.0.1/xslt/AUNZ-UBL-validation.xslt",
                                                                                            _getCL ());
 
   // 1.0.2
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_102 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.2");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_102 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.2");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_102 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.2");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_102 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.2");
 
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_102 = new ClassPathResource (BASE_PATH +
                                                                                                            "1.0.2/xslt/AUNZ-PEPPOL-SB-validation.xslt",
                                                                                                            _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_102 = new ClassPathResource (BASE_PATH +
                                                                                               "1.0.2/xslt/AUNZ-PEPPOL-validation.xslt",
                                                                                               _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_UBL_102 = new ClassPathResource (BASE_PATH +
                                                                                            "1.0.2/xslt/AUNZ-UBL-validation.xslt",
                                                                                            _getCL ());
 
   // 1.0.3
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_103 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.3");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_103 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.3");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_103 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.3");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_103 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.3");
 
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_103 = new ClassPathResource (BASE_PATH +
                                                                                                            "1.0.3/xslt/AUNZ-PEPPOL-SB-validation.xslt",
                                                                                                            _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_103 = new ClassPathResource (BASE_PATH +
                                                                                               "1.0.3/xslt/AUNZ-PEPPOL-validation.xslt",
                                                                                               _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_UBL_103 = new ClassPathResource (BASE_PATH +
                                                                                            "1.0.3/xslt/AUNZ-UBL-validation.xslt",
                                                                                            _getCL ());
 
   // 1.0.4
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_104 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.4");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_104 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.4");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_104 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.4");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_104 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.4");
 
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_104 = new ClassPathResource (BASE_PATH +
                                                                                                            "1.0.4/xslt/AUNZ-PEPPOL-SB-validation.xslt",
                                                                                                            _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_104 = new ClassPathResource (BASE_PATH +
                                                                                               "1.0.4/xslt/AUNZ-PEPPOL-validation.xslt",
                                                                                               _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_UBL_104 = new ClassPathResource (BASE_PATH +
                                                                                            "1.0.4/xslt/AUNZ-UBL-validation.xslt",
                                                                                            _getCL ());
 
   // 1.0.5
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_105 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.5");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_105 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.5");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_105 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.5");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_105 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.5");
 
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_105 = new ClassPathResource (BASE_PATH +
                                                                                                            "1.0.5/xslt/AUNZ-PEPPOL-SB-validation.xslt",
                                                                                                            _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_105 = new ClassPathResource (BASE_PATH +
                                                                                               "1.0.5/xslt/AUNZ-PEPPOL-validation.xslt",
                                                                                               _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_UBL_105 = new ClassPathResource (BASE_PATH +
                                                                                            "1.0.5/xslt/AUNZ-UBL-validation.xslt",
                                                                                            _getCL ());
 
   // 1.0.6
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_106 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.6");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_106 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.6");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_106 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.6");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_106 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.6");
 
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_106 = new ClassPathResource (BASE_PATH +
                                                                                                            "1.0.6/xslt/AUNZ-PEPPOL-SB-validation.xslt",
                                                                                                            _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_PEPPOL_106 = new ClassPathResource (BASE_PATH +
                                                                                               "1.0.6/xslt/AUNZ-PEPPOL-validation.xslt",
                                                                                               _getCL ());
-  @Deprecated
   public static final IReadableResource BIS3_BILLING_AUNZ_UBL_106 = new ClassPathResource (BASE_PATH +
                                                                                            "1.0.6/xslt/AUNZ-UBL-validation.xslt",
                                                                                            _getCL ());
 
   // 1.0.7
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_107 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.7");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_107 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.7");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_107 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.7");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_107 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.7");
 
   // 1.0.8
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_108 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                   "invoice",
                                                                                   "1.0.8");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_108 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                "invoice-self-billing",
                                                                                                "1.0.8");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_108 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                       "creditnote",
                                                                                       "1.0.8");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_108 = new VESID ("eu.peppol.bis3.aunz.ubl",
                                                                                                    "creditnote-self-billing",
                                                                                                    "1.0.8");
@@ -304,6 +250,12 @@ private static ClassLoader _getCL ()
   private PeppolLegacyValidationAUNZ ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -323,7 +275,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_100,
                                                                            "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                      sVersion100,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_100,
                                                                                                                     aNSCtxInvoice),
@@ -332,7 +284,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_100,
                                                                            "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                          sVersion100,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_100,
                                                                                                                     aNSCtxCreditNote),
@@ -343,7 +295,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_100,
                                                                            "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                   sVersion100,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_100,
                                                                                                                     aNSCtxInvoice),
@@ -352,7 +304,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_100,
                                                                            "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                       sVersion100,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_100,
                                                                                                                     aNSCtxCreditNote),
@@ -364,7 +316,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_101,
                                                                            "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                      sVersion101,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_101,
                                                                                                                     aNSCtxInvoice),
@@ -373,7 +325,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_101,
                                                                            "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                          sVersion101,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_101,
                                                                                                                     aNSCtxCreditNote),
@@ -384,7 +336,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_101,
                                                                            "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                   sVersion101,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_101,
                                                                                                                     aNSCtxInvoice),
@@ -393,7 +345,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_101,
                                                                            "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                       sVersion101,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_101,
                                                                                                                     aNSCtxCreditNote),
@@ -405,7 +357,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_102,
                                                                            "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                      sVersion102,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_102,
                                                                                                                     aNSCtxInvoice),
@@ -414,7 +366,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_102,
                                                                            "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                          sVersion102,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_102,
                                                                                                                     aNSCtxCreditNote),
@@ -425,7 +377,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_102,
                                                                            "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                   sVersion102,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_102,
                                                                                                                     aNSCtxInvoice),
@@ -434,7 +386,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_102,
                                                                            "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                       sVersion102,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_102,
                                                                                                                     aNSCtxCreditNote),
@@ -446,7 +398,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_103,
                                                                            "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                      sVersion103,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_103,
                                                                                                                     aNSCtxInvoice),
@@ -455,7 +407,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_103,
                                                                            "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                          sVersion103,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_103,
                                                                                                                     aNSCtxCreditNote),
@@ -466,7 +418,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_103,
                                                                            "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                   sVersion103,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_103,
                                                                                                                     aNSCtxInvoice),
@@ -475,7 +427,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_103,
                                                                            "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                       sVersion103,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_103,
                                                                                                                     aNSCtxCreditNote),
@@ -487,7 +439,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_104,
                                                                            "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                      sVersion104,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_104,
                                                                                                                     aNSCtxInvoice),
@@ -496,7 +448,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_104,
                                                                            "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                          sVersion104,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_104,
                                                                                                                     aNSCtxCreditNote),
@@ -507,7 +459,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_104,
                                                                            "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                   sVersion104,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_104,
                                                                                                                     aNSCtxInvoice),
@@ -516,7 +468,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_104,
                                                                            "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                       sVersion104,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_104,
                                                                                                                     aNSCtxCreditNote),
@@ -528,7 +480,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_105,
                                                                            "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                      sVersion105,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_105,
                                                                                                                     aNSCtxInvoice),
@@ -537,7 +489,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_105,
                                                                            "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                          sVersion105,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_105,
                                                                                                                     aNSCtxCreditNote),
@@ -548,7 +500,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_105,
                                                                            "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                   sVersion105,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_105,
                                                                                                                     aNSCtxInvoice),
@@ -557,7 +509,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_105,
                                                                            "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                       sVersion105,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_105,
                                                                                                                     aNSCtxCreditNote),
@@ -569,7 +521,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_106,
                                                                            "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                      sVersion106,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_106,
                                                                                                                     aNSCtxInvoice),
@@ -578,7 +530,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_106,
                                                                            "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                          sVersion106,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_106,
                                                                                                                     aNSCtxCreditNote),
@@ -589,7 +541,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_106,
                                                                            "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                   sVersion106,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_106,
                                                                                                                     aNSCtxInvoice),
@@ -598,7 +550,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_106,
                                                                            "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                       sVersion106,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_106,
                                                                                                                     aNSCtxCreditNote),
@@ -621,7 +573,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_107,
                                                                              "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                        sVersion107,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_107,
                                                                                                                       aNSCtxInvoice),
@@ -630,7 +582,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_107,
                                                                              "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                            sVersion107,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_107,
                                                                                                                       aNSCtxCreditNote),
@@ -641,7 +593,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_107,
                                                                              "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                     sVersion107,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_107,
                                                                                                                       aNSCtxInvoice),
@@ -650,7 +602,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_107,
                                                                              "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                         sVersion107,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_107,
                                                                                                                       aNSCtxCreditNote),
@@ -674,7 +626,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_108,
                                                                              "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                        sVersion108,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_108,
                                                                                                                       aNSCtxInvoice),
@@ -683,7 +635,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_108,
                                                                              "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                            sVersion108,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_108,
                                                                                                                       aNSCtxCreditNote),
@@ -694,7 +646,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_108,
                                                                              "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                     sVersion108,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_108,
                                                                                                                       aNSCtxInvoice),
@@ -703,7 +655,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_108,
                                                                              "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                         sVersion108,
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_108,
                                                                                                                       aNSCtxCreditNote),
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationReporting.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationReporting.java
index 56c7972a..3879d8eb 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationReporting.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationReporting.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -35,6 +37,7 @@
  * @since 3.1.8
  */
 @Immutable
+@Deprecated
 public final class PeppolLegacyValidationReporting
 {
   @Nonnull
@@ -50,35 +53,30 @@ private static ClassLoader _getCL ()
 
   // EUSR
 
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_EUSR_V100RC2 = new VESID (GROUP_ID, "eusr", "1.0.0-RC2");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_EUSR_V100 = new VESID (GROUP_ID, "eusr", "1.0.0");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_EUSR_V101 = new VESID (GROUP_ID, "eusr", "1.0.1");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_EUSR_V110 = new VESID (GROUP_ID, "eusr", "1.1.0");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_EUSR_V111 = new VESID (GROUP_ID, "eusr", "1.1.1");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_EUSR_V112 = new VESID (GROUP_ID, "eusr", "1.1.2");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_EUSR_V113 = new VESID (GROUP_ID, "eusr", "1.1.3");
 
   // TSR
 
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_TSR_V100 = new VESID (GROUP_ID, "tsr", "1.0.0");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_TSR_V101 = new VESID (GROUP_ID, "tsr", "1.0.1");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_TSR_V102 = new VESID (GROUP_ID, "tsr", "1.0.2");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_TSR_V103 = new VESID (GROUP_ID, "tsr", "1.0.3");
 
   private PeppolLegacyValidationReporting ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -89,7 +87,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     {
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V100RC2,
                                                                              "Peppol End User Statistics Report v1.0.0-RC2",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (new ClassPathResource (BASE_PATH_XSD +
                                                                                                                                   "peppol-end-user-statistics-reporting-1.0.0-RC2.xsd",
                                                                                                                                   _getCL ())),
@@ -102,7 +100,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V100,
                                                                              "Peppol End User Statistics Report v1.0.0",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD100),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.0.0/xslt/peppol-end-user-statistics-reporting-1.0.0.xslt",
@@ -110,7 +108,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V101,
                                                                              "Peppol End User Statistics Report v1.0.1",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD100),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.0.1/xslt/peppol-end-user-statistics-reporting-1.0.1.xslt",
@@ -122,7 +120,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                               _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V110,
                                                                              "Peppol End User Statistics Report v1.1.0",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD11),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.1.0/xslt/peppol-end-user-statistics-reporting-1.1.0.xslt",
@@ -130,7 +128,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V111,
                                                                              "Peppol End User Statistics Report v1.1.1",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD11),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.1.1/xslt/peppol-end-user-statistics-reporting-1.1.1.xslt",
@@ -138,7 +136,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V112,
                                                                              "Peppol End User Statistics Report v1.1.2",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD11),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.1.2/xslt/peppol-end-user-statistics-reporting-1.1.2.xslt",
@@ -146,7 +144,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V113,
                                                                              "Peppol End User Statistics Report v1.1.3",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD11),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.1.3/xslt/peppol-end-user-statistics-reporting-1.1.3.xslt",
@@ -158,7 +156,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     {
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_TSR_V100,
                                                                              "Peppol Transaction Statistics Report v1.0.0",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (new ClassPathResource (BASE_PATH_XSD +
                                                                                                                                   "peppol-transaction-statistics-reporting-1.0.0.xsd",
                                                                                                                                   _getCL ())),
@@ -172,7 +170,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_TSR_V101,
                                                                              "Peppol Transaction Statistics Report v1.0.1",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD101),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "tsr/1.0.1/xslt/peppol-transaction-statistics-reporting-1.0.1.xslt",
@@ -180,7 +178,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_TSR_V102,
                                                                              "Peppol Transaction Statistics Report v1.0.2",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD101),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "tsr/1.0.2/xslt/peppol-transaction-statistics-reporting-1.0.2.xslt",
@@ -188,7 +186,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_TSR_V103,
                                                                              "Peppol Transaction Statistics Report v1.0.3",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD101),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "tsr/1.0.3/xslt/peppol-transaction-statistics-reporting-1.0.3.xslt",
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationSG.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationSG.java
index 56590602..559e6609 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationSG.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolLegacyValidationSG.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -38,6 +40,7 @@
  * @author Philip Helger
  */
 @Immutable
+@Deprecated
 public final class PeppolLegacyValidationSG
 {
   @Nonnull
@@ -49,21 +52,17 @@ private static ClassLoader _getCL ()
   private static final String BASE_PATH = "external/schematron/peppol-sg/";
 
   // 1.0.0 aka 1
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_100 = new VESID ("eu.peppol.bis3.sg.ubl",
                                                                                 "invoice",
                                                                                 "1");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_100 = new VESID ("eu.peppol.bis3.sg.ubl",
                                                                                     "creditnote",
                                                                                     "1");
 
   // 1.0.2
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_102 = new VESID ("eu.peppol.bis3.sg.ubl",
                                                                                 "invoice",
                                                                                 "1.0.2");
-  @Deprecated
   public static final VESID VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_102 = new VESID ("eu.peppol.bis3.sg.ubl",
                                                                                     "creditnote",
                                                                                     "1.0.2");
@@ -71,6 +70,12 @@ private static ClassLoader _getCL ()
   private PeppolLegacyValidationSG ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -96,7 +101,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
 
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_100,
                                                                              "SG Peppol BIS3 Invoice (UBL) 1.0.0",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_100,
                                                                                                                       aNSCtxInvoice),
@@ -104,7 +109,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_100,
                                                                              "SG Peppol BIS3 Credit Note (UBL) 1.0.0",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_100,
                                                                                                                       aNSCtxCreditNote),
@@ -123,7 +128,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
 
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_102,
                                                                              "SG Peppol BIS3 Invoice (UBL) 1.0.2",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_102,
                                                                                                                       aNSCtxInvoice),
@@ -131,7 +136,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_102,
                                                                              "SG Peppol BIS3 Credit Note (UBL) 1.0.2",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_102,
                                                                                                                       aNSCtxCreditNote),
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation350.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation350.java
index cd4be8f8..4a398e31 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation350.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation350.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -222,78 +224,84 @@ private static ValidationExecutorSchematron _createSCH (@Nonnull final IReadable
     return ValidationExecutorSchematron.createSCH (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
 
     final String sVersion = " (" + VERSION_STR + ")";
-    final boolean bIsDeprecated = true;
+    final boolean bDeprecated = true;
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T01_V2,
                                                                            "OpenPeppol Order" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createPure (ORDER_RULES),
                                                                            _createPure (ORDER_OPENPEPPOL),
                                                                            _createPure (ORDER_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T10_V2,
                                                                            "OpenPeppol Invoice" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createPure (INVOICE_RULES),
                                                                            _createPure (INVOICE_OPENPEPPOL),
                                                                            _createPure (INVOICE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T14_V2,
                                                                            "OpenPeppol Credit Note" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createPure (CREDIT_NOTE_RULES),
                                                                            _createPure (CREDIT_NOTE_OPENPEPPOL),
                                                                            _createPure (CREDIT_NOTE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T16_V2,
                                                                            "OpenPeppol Despatch Advice" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createPure (DESPATCH_ADVICE_RULES),
                                                                            _createPure (DESPATCH_ADVICE_OPENPEPPOL),
                                                                            _createPure (DESPATCH_ADVICE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T19_V2,
                                                                            "OpenPeppol Catalogue" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createPure (CATALOGUE_RULES),
                                                                            _createSCH (CATALOGUE_OPENPEPPOL),
                                                                            _createPure (CATALOGUE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T58_V2,
                                                                            "OpenPeppol Catalogue Response" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createPure (CATALOGUE_RESPONSE_RULES),
                                                                            _createPure (CATALOGUE_RESPONSE_OPENPEPPOL),
                                                                            _createPure (CATALOGUE_RESPONSE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V2,
                                                                            "OpenPeppol MLR" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createPure (MLR_RULES),
                                                                            _createPure (MLR_OPENPEPPOL),
                                                                            _createPure (MLR_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T76_V2,
                                                                            "OpenPeppol Order Response" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createPure (ORDER_RESPONSE_RULES),
                                                                            _createPure (ORDER_RESPONSE_OPENPEPPOL),
                                                                            _createPure (ORDER_RESPONSE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T77_V1,
                                                                            "OpenPeppol Punch Out" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createPure (PUNCH_OUT_RULES),
                                                                            _createPure (PUNCH_OUT_OPENPEPPOL)));
     // Must use XSLT based conversion because of custom XSLT function!
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T110_V1,
                                                                            "OpenPeppol Order Agreement" + sVersion,
-                                                                           bIsDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createSCH (ORDER_AGREEMENT_RULES),
                                                                            _createSCH (ORDER_AGREEMENT_OPENPEPPOL)));
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation360.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation360.java
index 1b33131e..aaac2a29 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation360.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation360.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -224,6 +226,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -232,70 +240,70 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     final boolean bDeprecated = true;
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T01_V2,
                                                                            "OpenPeppol Order" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createPure (ORDER_RULES),
                                                                            _createPure (ORDER_OPENPEPPOL),
                                                                            _createPure (ORDER_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T10_V2,
                                                                            "OpenPeppol Invoice" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createPure (INVOICE_RULES),
                                                                            _createPure (INVOICE_OPENPEPPOL),
                                                                            _createPure (INVOICE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T14_V2,
                                                                            "OpenPeppol Credit Note" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createPure (CREDIT_NOTE_RULES),
                                                                            _createPure (CREDIT_NOTE_OPENPEPPOL),
                                                                            _createPure (CREDIT_NOTE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T16_V2,
                                                                            "OpenPeppol Despatch Advice" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createPure (DESPATCH_ADVICE_RULES),
                                                                            _createPure (DESPATCH_ADVICE_OPENPEPPOL),
                                                                            _createPure (DESPATCH_ADVICE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T19_V2,
                                                                            "OpenPeppol Catalogue" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createPure (CATALOGUE_RULES),
                                                                            _createXSLT (CATALOGUE_OPENPEPPOL_XSLT),
                                                                            _createPure (CATALOGUE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T58_V2,
                                                                            "OpenPeppol Catalogue Response" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createPure (CATALOGUE_RESPONSE_RULES),
                                                                            _createPure (CATALOGUE_RESPONSE_OPENPEPPOL),
                                                                            _createPure (CATALOGUE_RESPONSE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V2,
                                                                            "OpenPeppol MLR" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createPure (MLR_RULES),
                                                                            _createPure (MLR_OPENPEPPOL),
                                                                            _createPure (MLR_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T76_V2,
                                                                            "OpenPeppol Order Response" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createPure (ORDER_RESPONSE_RULES),
                                                                            _createPure (ORDER_RESPONSE_OPENPEPPOL),
                                                                            _createPure (ORDER_RESPONSE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T77_V1,
                                                                            "OpenPeppol Punch Out" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createPure (PUNCH_OUT_RULES),
                                                                            _createPure (PUNCH_OUT_OPENPEPPOL)));
     // Must use XSLT based conversion because of custom XSLT function!
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T110_V1,
                                                                            "OpenPeppol Order Agreement" + sVersion,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT_RULES_XSLT),
                                                                            _createXSLT (ORDER_AGREEMENT_OPENPEPPOL_XSLT)));
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation370.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation370.java
index 4e84379d..4d28f8c4 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation370.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation370.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -187,6 +189,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -196,14 +204,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     final boolean bDeprecated = true;
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T01_V2,
                                                                            "OpenPeppol Order" + sVersion + sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER_RULES),
                                                                            _createXSLT (ORDER_OPENPEPPOL),
                                                                            _createXSLT (ORDER_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T10_V2,
                                                                            "OpenPeppol Invoice" + sVersion + sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_RULES),
                                                                            _createXSLT (INVOICE_OPENPEPPOL),
@@ -212,7 +220,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                   sVersion +
                                                                                                   sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (CREDIT_NOTE_RULES),
                                                                            _createXSLT (CREDIT_NOTE_OPENPEPPOL),
@@ -221,14 +229,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                   sVersion +
                                                                                                   sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE_RULES),
                                                                            _createXSLT (DESPATCH_ADVICE_OPENPEPPOL),
                                                                            _createXSLT (DESPATCH_ADVICE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T19_V2,
                                                                            "OpenPeppol Catalogue" + sVersion + sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE_RULES),
                                                                            _createXSLT (CATALOGUE_OPENPEPPOL_XSLT),
@@ -237,14 +245,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                   sVersion +
                                                                                                   sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE_RULES),
                                                                            _createXSLT (CATALOGUE_RESPONSE_OPENPEPPOL),
                                                                            _createXSLT (CATALOGUE_RESPONSE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V2,
                                                                            "OpenPeppol MLR" + sVersion + sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR_RULES),
                                                                            _createXSLT (MLR_OPENPEPPOL),
@@ -253,14 +261,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Response" +
                                                                                                   sVersion +
                                                                                                   sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE_RULES),
                                                                            _createXSLT (ORDER_RESPONSE_OPENPEPPOL),
                                                                            _createXSLT (ORDER_RESPONSE_OPENPEPPOL_CORE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T77_V1,
                                                                            "OpenPeppol Punch Out" + sVersion + sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT_RULES),
                                                                            _createXSLT (PUNCH_OUT_OPENPEPPOL)));
@@ -268,7 +276,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Agreement" +
                                                                                                    sVersion +
                                                                                                    sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT_RULES),
                                                                            _createXSLT (ORDER_AGREEMENT_OPENPEPPOL)));
@@ -276,7 +284,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                    sVersion +
                                                                                                    sAkaBIS2,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE_RULES),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE_OPENPEPPOL)));
@@ -284,13 +292,13 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     // Billing BIS 3
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_UBL_INVOICE,
                                                                            "OpenPeppol Invoice BIS3 (UBL)",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (BIS3_BILLING_CEN),
                                                                            _createXSLT (BIS3_BILLING_PEPPOL)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_UBL_CREDIT_NOTE,
                                                                            "OpenPeppol Credit Note BIS3 (UBL)",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (BIS3_BILLING_CEN),
                                                                            _createXSLT (BIS3_BILLING_PEPPOL)));
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation380.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation380.java
index 96da22e9..46a6b2ec 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation380.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation380.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -113,6 +115,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -125,7 +133,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -133,67 +141,67 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T01_V3,
                                                                            "OpenPeppol Order" + sVersion + sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T16_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                   sVersion +
                                                                                                   sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T19_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                   sVersion +
                                                                                                   sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T58_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                   sVersion +
                                                                                                   sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V3,
                                                                            "OpenPeppol MLR" + sVersion + sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T76_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                   sVersion +
                                                                                                   sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T77_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                   sVersion +
                                                                                                   sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T110_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                    sVersion +
                                                                                                    sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T111_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                    sVersion +
                                                                                                    sVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation381.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation381.java
index d351b33d..e2a26908 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation381.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation381.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -113,6 +115,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -125,7 +133,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -133,7 +141,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -141,61 +149,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T16_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T19_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T58_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T76_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T77_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T110_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T111_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation390.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation390.java
index f195392b..ef448b30 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation390.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation390.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -113,6 +115,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -125,7 +133,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -133,7 +141,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -141,61 +149,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T16_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T19_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T58_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T76_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T77_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T110_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T111_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation391.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation391.java
index 29b5086d..4fd52e80 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation391.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation391.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -113,6 +115,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -125,7 +133,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -133,7 +141,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -141,61 +149,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T16_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T19_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T58_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T76_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T77_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T110_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T111_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_0.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_0.java
index 9fd4a549..da21b0ce 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_0.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_0.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -171,6 +173,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -185,7 +193,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -193,7 +201,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -202,14 +210,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_V3,
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
 
@@ -217,14 +225,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
 
@@ -232,14 +240,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Catalogue" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
 
@@ -247,25 +255,25 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
 
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_T71_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
 
@@ -273,14 +281,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Response" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
 
@@ -288,14 +296,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Punch Out" +
                                                                                                   sVersion +
                                                                                                   sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
 
@@ -303,14 +311,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Agreement" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
 
@@ -318,14 +326,14 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                    sVersion +
                                                                                                    sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_1.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_1.java
index 568770bd..8b3520ae 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_1.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_10_1.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -117,6 +119,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -133,7 +141,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -141,7 +149,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -149,61 +157,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_0.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_0.java
index 6b3e03ac..085eae54 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_0.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_0.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -119,6 +121,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -135,7 +143,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -143,7 +151,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -151,61 +159,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_1.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_1.java
index 9f84ae4f..d1e15cc6 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_1.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_11_1.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -118,6 +120,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -134,7 +142,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -142,7 +150,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -150,61 +158,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_12_0.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_12_0.java
index c34e0177..b5114eea 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_12_0.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_12_0.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -118,6 +120,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -134,7 +142,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -142,7 +150,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -150,61 +158,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_13_0.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_13_0.java
index 646763fc..0cf56949 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_13_0.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_13_0.java
@@ -30,6 +30,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -118,6 +120,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -134,7 +142,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Invoice" +
                                                                                                       sVersion +
                                                                                                       sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -142,7 +150,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Credit Note" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_CEN),
                                                                            _createXSLT (INVOICE_PEPPOL)));
@@ -150,61 +158,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXSLT (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXSLT (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXSLT (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXSLT (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_14_0.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_14_0.java
index 54f706f1..702a25c8 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_14_0.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_14_0.java
@@ -32,6 +32,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -134,6 +136,12 @@ private static ValidationExecutorSchematron _createXsltUBL (@Nonnull final IRead
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -150,7 +158,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Invoice" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -158,7 +166,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Credit Note" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -166,7 +174,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol CII Invoice" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXsltCII (INVOICE_CII_CEN),
                                                                            _createXsltCII (INVOICE_CII_PEPPOL)));
@@ -174,61 +182,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXsltUBL (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXsltUBL (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_15_0.java b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_15_0.java
index 41e6e93c..884c9cdf 100644
--- a/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_15_0.java
+++ b/phive-rules-peppol-legacy/src/main/java/com/helger/phive/peppol/legacy/PeppolValidation3_15_0.java
@@ -32,6 +32,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -94,6 +96,12 @@ private static ValidationExecutorSchematron _createXsltUBL (@Nonnull final IRead
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -128,7 +136,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Invoice" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -136,7 +144,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Credit Note" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -144,7 +152,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol CII Invoice" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXsltCII (INVOICE_CII_CEN),
                                                                            _createXsltCII (INVOICE_CII_PEPPOL)));
@@ -152,61 +160,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXsltUBL (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXsltUBL (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (INVOICE_MESSAGE_RESPONSE)));
   }
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java
index c311a112..12b55199 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_05.java
@@ -31,6 +31,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -102,6 +104,12 @@ private static ValidationExecutorSchematron _createXsltUBL (@Nonnull final IRead
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -137,7 +145,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Invoice" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -145,7 +153,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Credit Note" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBilling,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -162,61 +170,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXsltUBL (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXsltUBL (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (INVOICE_MESSAGE_RESPONSE)));
     // UBL 2.3!
@@ -224,7 +232,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Change" +
                                                                                                            sVersion +
                                                                                                            sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderChangeXSDs ()),
                                                                            _createXsltUBL (ORDER_CHANGE)));
     // UBL 2.3!
@@ -232,7 +240,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Cancellation" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderCancellationXSDs ()),
                                                                            _createXsltUBL (ORDER_CANCELLATION)));
     // UBL 2.3!
@@ -240,7 +248,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Response Advanced" +
                                                                                                                       sVersion +
                                                                                                                       sAkaVersionBIS,
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE_ADVANCED)));
   }
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_11.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_11.java
index 70c06c1a..646a7804 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_11.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidation2023_11.java
@@ -31,6 +31,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -101,6 +103,12 @@ private static ValidationExecutorSchematron _createXsltUBL (@Nonnull final IRead
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -136,7 +144,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Invoice" +
                                                                                                           sVersion +
                                                                                                           sAkaVersionBilling,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -144,7 +152,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol UBL Credit Note" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBilling,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXsltUBL (INVOICE_UBL_CEN),
                                                                            _createXsltUBL (INVOICE_UBL_PEPPOL)));
@@ -153,7 +161,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     // "OpenPeppol CII Invoice" +
     // sVersion +
     // sAkaVersionBilling,
-    // bNotDeprecated,
+    // _createStatus (bNotDeprecated),
     // ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
     // _createXsltCII (INVOICE_CII_CEN),
     // _createXsltCII (INVOICE_CII_PEPPOL)));
@@ -161,61 +169,61 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order" +
                                                                                                     sVersion +
                                                                                                     sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXsltUBL (ORDER)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_DESPATCH_ADVICE_V3,
                                                                            "OpenPeppol Despatch Advice" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ()),
                                                                            _createXsltUBL (DESPATCH_ADVICE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_V3,
                                                                            "OpenPeppol Catalogue" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (CATALOGUE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_CATALOGUE_RESPONSE_V3,
                                                                            "OpenPeppol Catalogue Response" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (CATALOGUE_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MLR_V3,
                                                                            "OpenPeppol MLR" + sVersion + sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (MLR)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_RESPONSE_V3,
                                                                            "OpenPeppol Order Response" +
                                                                                                              sVersion +
                                                                                                              sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PUNCH_OUT_V3,
                                                                            "OpenPeppol Punch Out" +
                                                                                                         sVersion +
                                                                                                         sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ()),
                                                                            _createXsltUBL (PUNCH_OUT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_ORDER_AGREEMENT_V3,
                                                                            "OpenPeppol Order Agreement" +
                                                                                                               sVersion +
                                                                                                               sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_AGREEMENT)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_INVOICE_MESSAGE_RESPONSE_V3,
                                                                            "OpenPeppol Invoice Message Response" +
                                                                                                                        sVersion +
                                                                                                                        sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ()),
                                                                            _createXsltUBL (INVOICE_MESSAGE_RESPONSE)));
     // UBL 2.3!
@@ -223,7 +231,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Change" +
                                                                                                            sVersion +
                                                                                                            sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderChangeXSDs ()),
                                                                            _createXsltUBL (ORDER_CHANGE)));
     // UBL 2.3!
@@ -231,7 +239,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Cancellation" +
                                                                                                                  sVersion +
                                                                                                                  sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderCancellationXSDs ()),
                                                                            _createXsltUBL (ORDER_CANCELLATION)));
     // UBL 2.3!
@@ -239,7 +247,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                            "OpenPeppol Order Response Advanced" +
                                                                                                                       sVersion +
                                                                                                                       sAkaVersionBIS,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderResponseXSDs ()),
                                                                            _createXsltUBL (ORDER_RESPONSE_ADVANCED)));
   }
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationAUNZ.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationAUNZ.java
index 1020b697..0f1cf69c 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationAUNZ.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationAUNZ.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -79,6 +81,12 @@ private static ClassLoader _getCL ()
   private PeppolValidationAUNZ ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -110,7 +118,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_109,
                                                                              "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                        sVersion109,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_109,
                                                                                                                       aNSCtxInvoice),
@@ -119,7 +127,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_109,
                                                                              "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                            sVersion109,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_109,
                                                                                                                       aNSCtxCreditNote),
@@ -130,7 +138,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_109,
                                                                              "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                     sVersion109,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_109,
                                                                                                                       aNSCtxInvoice),
@@ -139,7 +147,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_109,
                                                                              "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                         sVersion109,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_109,
                                                                                                                       aNSCtxCreditNote),
@@ -163,7 +171,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_1_0_10,
                                                                              "A-NZ Peppol BIS3 Invoice (UBL) " +
                                                                                                                           sVersion1010,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_1_0_10,
                                                                                                                       aNSCtxInvoice),
@@ -172,7 +180,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_1_0_10,
                                                                              "A-NZ Peppol BIS3 Credit Note (UBL) " +
                                                                                                                               sVersion1010,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_1_0_10,
                                                                                                                       aNSCtxCreditNote),
@@ -183,7 +191,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_INVOICE_SELF_BILLING_1_0_10,
                                                                              "A-NZ Peppol BIS3 Invoice Self-Billing (UBL) " +
                                                                                                                                        sVersion1010,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_1_0_10,
                                                                                                                       aNSCtxInvoice),
@@ -192,7 +200,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_AUNZ_UBL_CREDIT_NOTE_SELF_BILLING_1_0_10,
                                                                              "A-NZ Peppol BIS3 Credit Note Self-Billing (UBL) " +
                                                                                                                                            sVersion1010,
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_AUNZ_PEPPOL_SELF_BILLING_1_0_10,
                                                                                                                       aNSCtxCreditNote),
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationDirectory.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationDirectory.java
index 7d9a46ea..0fb433ca 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationDirectory.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationDirectory.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
 
@@ -60,6 +62,12 @@ private static ClassLoader _getCL ()
   private PeppolValidationDirectory ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -74,7 +82,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                     _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BUSINESS_CARD_V1,
                                                                              "Peppol Directory BusinessCard v1",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (DIRECTORY_V1)));
     }
 
@@ -85,7 +93,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                     _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BUSINESS_CARD_V2,
                                                                              "Peppol Directory BusinessCard v2",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (DIRECTORY_V2)));
     }
 
@@ -96,7 +104,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                     _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BUSINESS_CARD_V3,
                                                                              "Peppol Directory BusinessCard v3",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (DIRECTORY_V3)));
     }
   }
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationJP.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationJP.java
index 1ca1638d..f97bbb3e 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationJP.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationJP.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -56,6 +58,12 @@ private static ClassLoader _getCL ()
   private PeppolValidationJP ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -80,7 +88,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                              _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_JP_PINT_INVOICE_012,
                                                                              "Japan PINT Invoice (UBL) 0.1.2",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (aCPR1,
                                                                                                                       aNSCtxInvoice),
@@ -88,7 +96,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_JP_PINT_CREDIT_NOTE_012,
                                                                              "Japan PINT Credit Note (UBL) 0.1.2",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (aCPR1,
                                                                                                                       aNSCtxCreditNote),
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationMY.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationMY.java
index 7f0927ef..9f01effc 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationMY.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationMY.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -61,6 +63,12 @@ private static ClassLoader _getCL ()
   private PeppolValidationMY ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -85,7 +93,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                        _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MY_PINT_UBL_INVOICE_1_0_0,
                                                                              "Malaysia PINT Invoice (UBL) 1.0.0",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (PeppolValidationPINT.RES_OPENPEPPOL_PINT_1_0_1,
                                                                                                                       aNSCtxInvoice),
@@ -93,7 +101,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MY_PINT_UBL_CREDIT_NOTE_1_0_0,
                                                                              "Malaysia PINT Credit Note (UBL) 1.0.0",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (PeppolValidationPINT.RES_OPENPEPPOL_PINT_1_0_1,
                                                                                                                       aNSCtxCreditNote),
@@ -102,7 +110,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
 
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MY_PINT_UBL_INVOICE_SELF_BILLING_1_0_0,
                                                                              "Malaysia PINT Invoice Self-Billing (UBL) 1.0.0",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (PeppolValidationPINT.RES_OPENPEPPOL_PINT_1_0_1,
                                                                                                                       aNSCtxInvoice),
@@ -110,7 +118,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_MY_PINT_UBL_CREDIT_NOTE_SELF_BILLING_1_0_0,
                                                                              "Malaysia PINT Credit Note Self-Billing (UBL) 1.0.0",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (PeppolValidationPINT.RES_OPENPEPPOL_PINT_1_0_1,
                                                                                                                       aNSCtxCreditNote),
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationPINT.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationPINT.java
index 38cf10ee..c92de6bc 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationPINT.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationPINT.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -71,6 +73,12 @@ private static ClassLoader _getCL ()
   private PeppolValidationPINT ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -90,13 +98,13 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     {
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PINT_INVOICE_1_0_0,
                                                                              "OpenPeppol PINT Invoice (UBL) 1.0.0",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (RES_OPENPEPPOL_PINT_1_0_0,
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PINT_CREDIT_NOTE_1_0_0,
                                                                              "OpenPeppol PINT Credit Note (UBL) 1.0.0",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (RES_OPENPEPPOL_PINT_1_0_0,
                                                                                                                       aNSCtxCreditNote)));
@@ -106,13 +114,13 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
     {
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PINT_INVOICE_1_0_1,
                                                                              "OpenPeppol PINT Invoice (UBL) 1.0.1",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (RES_OPENPEPPOL_PINT_1_0_1,
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_PINT_CREDIT_NOTE_1_0_1,
                                                                              "OpenPeppol PINT Credit Note (UBL) 1.0.1",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (RES_OPENPEPPOL_PINT_1_0_1,
                                                                                                                       aNSCtxCreditNote)));
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationReporting.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationReporting.java
index a00647c0..a9bf4757 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationReporting.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationReporting.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -63,6 +65,12 @@ private static ClassLoader _getCL ()
   private PeppolValidationReporting ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -78,7 +86,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
 
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V114,
                                                                              "Peppol End User Statistics Report v1.1.4",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD11),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.1.4/xslt/peppol-end-user-statistics-reporting-1.1.4.xslt",
@@ -86,7 +94,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_EUSR_V115,
                                                                              "Peppol End User Statistics Report v1.1.5",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD11),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "eusr/1.1.5/xslt/peppol-end-user-statistics-reporting-1.1.5.xslt",
@@ -102,7 +110,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
 
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_TSR_V104,
                                                                              "Peppol Transaction Statistics Report v1.0.4",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD101),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "tsr/1.0.4/xslt/peppol-transaction-statistics-reporting-1.0.4.xslt",
@@ -110,7 +118,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       null)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_TSR_V105,
                                                                              "Peppol Transaction Statistics Report v1.0.5",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (aXSD101),
                                                                              ValidationExecutorSchematron.createXSLT (new ClassPathResource (BASE_PATH_SCH +
                                                                                                                                              "tsr/1.0.5/xslt/peppol-transaction-statistics-reporting-1.0.5.xslt",
diff --git a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationSG.java b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationSG.java
index ada7c0d6..f5d5bc91 100644
--- a/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationSG.java
+++ b/phive-rules-peppol/src/main/java/com/helger/phive/peppol/PeppolValidationSG.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -69,6 +71,12 @@ private static ClassLoader _getCL ()
   private PeppolValidationSG ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidationSourceXML> aRegistry)
   {
     ValueEnforcer.notNull (aRegistry, "Registry");
@@ -94,7 +102,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                   _getCL ());
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_103,
                                                                              "SG Peppol BIS3 Invoice (UBL) 1.0.3",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_103,
                                                                                                                       aNSCtxInvoice),
@@ -102,7 +110,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_103,
                                                                              "SG Peppol BIS3 Credit Note (UBL) 1.0.3",
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_103,
                                                                                                                       aNSCtxCreditNote),
@@ -124,7 +132,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
 
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_INVOICE_2023_7,
                                                                              "SG Peppol BIS3 Invoice (UBL) 2023.7",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_2023_07,
                                                                                                                       aNSCtxInvoice),
@@ -134,7 +142,7 @@ public static void init (@Nonnull final IValidationExecutorSetRegistry <IValidat
                                                                                                                       aNSCtxInvoice)));
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OPENPEPPOL_BIS3_SG_UBL_CREDIT_NOTE_2023_7,
                                                                              "SG Peppol BIS3 Credit Note (UBL) 2023.7",
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (BIS3_BILLING_SG_CEN_2023_07,
                                                                                                                       aNSCtxInvoice),
diff --git a/phive-rules-setu/src/main/java/com/helger/phive/setu/SETUValidation.java b/phive-rules-setu/src/main/java/com/helger/phive/setu/SETUValidation.java
index 6d1fde88..5134dfc0 100644
--- a/phive-rules-setu/src/main/java/com/helger/phive/setu/SETUValidation.java
+++ b/phive-rules-setu/src/main/java/com/helger/phive/setu/SETUValidation.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -64,6 +66,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, NS_CTX.getClone ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard SETU validation execution sets to the provided
    * registry.
@@ -94,7 +102,7 @@ public static void initSETU (@Nonnull final IValidationExecutorSetRegistry <IVal
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_TIMECARD_14,
                                                                            "SETU Timcard " +
                                                                                             VID_TIMECARD_14.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CXML_XSD.getXSDResource (),
                                                                                                          new ClassPathResource ("/external/schemas/hr-xml-2007/SIDES/TimeCardAdditionalData.xsd",
                                                                                                                                 _getCL ()),
diff --git a/phive-rules-simplerinvoicing/src/main/java/com/helger/phive/simplerinvoicing/SimplerInvoicingValidation.java b/phive-rules-simplerinvoicing/src/main/java/com/helger/phive/simplerinvoicing/SimplerInvoicingValidation.java
index 5ba58400..47cca039 100644
--- a/phive-rules-simplerinvoicing/src/main/java/com/helger/phive/simplerinvoicing/SimplerInvoicingValidation.java
+++ b/phive-rules-simplerinvoicing/src/main/java/com/helger/phive/simplerinvoicing/SimplerInvoicingValidation.java
@@ -25,6 +25,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -257,6 +259,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final ClassPat
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard SimplerInvoicing validation execution sets to the
    * provided registry.
@@ -277,201 +285,201 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 1.1
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V10,
                                                                            "Simplerinvoicing Invoice 1.0",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI10)));
 
     // 1.1
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V11,
                                                                            "Simplerinvoicing Invoice 1.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI11)));
 
     // 1.2
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V12,
                                                                            "Simplerinvoicing Invoice 1.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI12)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_ORDER_V12,
                                                                            "Simplerinvoicing Order 1.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER_SI12)));
 
     // 1.2.3
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V123,
                                                                            "Simplerinvoicing Invoice 1.2.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI123)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_ORDER_V123,
                                                                            "Simplerinvoicing Order 1.2.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER_SI123)));
 
     // 1.2.4
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V124,
                                                                            "Simplerinvoicing Invoice 1.2.4",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI124)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_ORDER_V124,
                                                                            "Simplerinvoicing Order 1.2.4",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ()),
                                                                            _createXSLT (ORDER_SI124)));
 
     // 2.0
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V20,
                                                                            "Simplerinvoicing Invoice 2.0",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI20)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V20,
                                                                            "Simplerinvoicing Credit Note 2.0",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI20)));
 
     // 2.0.1
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V201,
                                                                            "Simplerinvoicing Invoice 2.0.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI201)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V201,
                                                                            "Simplerinvoicing Credit Note 2.0.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI201)));
 
     // 2.0.2
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V202,
                                                                            "Simplerinvoicing Invoice 2.0.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI202)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V202,
                                                                            "Simplerinvoicing Credit Note 2.0.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI202)));
 
     // 2.0.3
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V203,
                                                                            "Simplerinvoicing Invoice 2.0.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI203)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V203,
                                                                            "Simplerinvoicing Credit Note 2.0.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI203)));
 
     // 2.0.3.1
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2031,
                                                                            "Simplerinvoicing Invoice 2.0.3.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2031)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2031,
                                                                            "Simplerinvoicing Credit Note 2.0.3.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2031)));
 
     // 2.0.3.2
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2032,
                                                                            "Simplerinvoicing Invoice 2.0.3.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2032)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2032,
                                                                            "Simplerinvoicing Credit Note 2.0.3.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2032)));
 
     // 2.0.3.3
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2033,
                                                                            "Simplerinvoicing Invoice 2.0.3.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2033)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2033,
                                                                            "Simplerinvoicing Credit Note 2.0.3.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2033)));
 
     // 2.0.3.4
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2034,
                                                                            "Simplerinvoicing Invoice 2.0.3.4",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2034)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2034,
                                                                            "Simplerinvoicing Credit Note 2.0.3.4",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2034)));
 
     // 2.0.3.5
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2035,
                                                                            "Simplerinvoicing Invoice 2.0.3.5",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2035)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2035,
                                                                            "Simplerinvoicing Credit Note 2.0.3.5",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2035)));
 
     // 2.0.3.6
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2036,
                                                                            "Simplerinvoicing Invoice 2.0.3.6",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2036)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2036,
                                                                            "Simplerinvoicing Credit Note 2.0.3.6",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2036)));
 
     // 2.0.3.7
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2037,
                                                                            "Simplerinvoicing Invoice 2.0.3.7",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2037)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2037,
                                                                            "Simplerinvoicing Credit Note 2.0.3.7",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2037)));
 
     // 2.0.3.8
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_V2038,
                                                                            "Simplerinvoicing Invoice 2.0.3.8",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (INVOICE_SI2038)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_CREDIT_NOTE_V2038,
                                                                            "Simplerinvoicing Credit Note 2.0.3.8",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (INVOICE_SI2038)));
 
     // 2.0 G-Account 1.0
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V10,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.xslt",
@@ -480,7 +488,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.1
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V101,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.1.xslt",
@@ -489,7 +497,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.2
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V102,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.2.xslt",
@@ -498,7 +506,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.3
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V103,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.3.xslt",
@@ -507,7 +515,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.4
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V104,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.4",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.4.xslt",
@@ -516,7 +524,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.5
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V105,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.5",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.5.xslt",
@@ -525,7 +533,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.6
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V106,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.6",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.6.xslt",
@@ -534,7 +542,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.7
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V107,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.7",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.7.xslt",
@@ -543,7 +551,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // 2.0 G-Account 1.0.8
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_INVOICE_20_GACCOUNT_V108,
                                                                            "Simplerinvoicing 2.0 G-Account extension 1.0.8",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (new ClassPathResource (PATH_SI +
                                                                                                                "si-ubl-2.0-ext-gaccount-1.0.8.xslt",
@@ -552,7 +560,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V103,
                                                                            "NLCIUS-CII 1.0.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.xslt",
@@ -561,7 +569,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3.1
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1031,
                                                                            "NLCIUS-CII 1.0.3.1",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.1.xslt",
@@ -570,7 +578,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3.2
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1032,
                                                                            "NLCIUS-CII 1.0.3.2",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.2.xslt",
@@ -579,7 +587,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3.3
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1033,
                                                                            "NLCIUS-CII 1.0.3.3",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.3.xslt",
@@ -588,7 +596,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3.4
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1034,
                                                                            "NLCIUS-CII 1.0.3.4",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.4.xslt",
@@ -597,7 +605,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3.5
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1035,
                                                                            "NLCIUS-CII 1.0.3.5",
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.5.xslt",
@@ -606,7 +614,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3.6
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1036,
                                                                            "NLCIUS-CII 1.0.3.6",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.6.xslt",
@@ -615,7 +623,7 @@ public static void initSimplerInvoicing (@Nonnull final IValidationExecutorSetRe
     // NLCIUS 1.0.3.7
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SI_NLCIUS_CII_V1037,
                                                                            "NLCIUS-CII 1.0.3.7",
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                            _createXSLT (new ClassPathResource (PATH_NL_CIUS +
                                                                                                                "nlcius-cii-1.0.3.7.xslt",
diff --git a/phive-rules-svefaktura/src/main/java/com/helger/phive/svefaktura/SvefakturaValidation.java b/phive-rules-svefaktura/src/main/java/com/helger/phive/svefaktura/SvefakturaValidation.java
index da48b410..20514ac9 100644
--- a/phive-rules-svefaktura/src/main/java/com/helger/phive/svefaktura/SvefakturaValidation.java
+++ b/phive-rules-svefaktura/src/main/java/com/helger/phive/svefaktura/SvefakturaValidation.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -77,6 +79,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final ClassPat
     return ValidationExecutorSchematron.createXSLT (aRes, NS_CTX);
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard Svefaktura validation execution sets to the provided
    * registry.
@@ -93,7 +101,7 @@ public static void initSvefaktura (@Nonnull final IValidationExecutorSetRegistry
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_SVEFAKTURA_10,
                                                                            "SvefakturaXML " +
                                                                                               VID_SVEFAKTURA_10.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource ("/external/schemas/1.0/maindoc/SFTI-BasicInvoice-1.0.xsd",
                                                                                                                                 _getCL ())),
                                                                            _createXSLT (new ClassPathResource ("/external/schemas/1.0/svenfaktura-1.0-sch.xslt",
@@ -103,7 +111,7 @@ public static void initSvefaktura (@Nonnull final IValidationExecutorSetRegistry
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_OBJECT_ENVELOPE_10,
                                                                            "SvefakturaXML ObjectEnvelope " +
                                                                                                    VID_OBJECT_ENVELOPE_10.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource ("/external/schemas/1.0/maindoc/SFTI-ObjectEnvelope-1.0.xsd",
                                                                                                                                 _getCL ()))));
   }
diff --git a/phive-rules-teapps/src/main/java/com/helger/phive/teapps/TEAPPSValidation.java b/phive-rules-teapps/src/main/java/com/helger/phive/teapps/TEAPPSValidation.java
index 5bfb42f8..206a5717 100644
--- a/phive-rules-teapps/src/main/java/com/helger/phive/teapps/TEAPPSValidation.java
+++ b/phive-rules-teapps/src/main/java/com/helger/phive/teapps/TEAPPSValidation.java
@@ -24,6 +24,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
 
@@ -49,6 +51,12 @@ private static ClassLoader _getCL ()
     return TEAPPSValidation.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard TEAPPS validation execution sets to the provided
    * registry.
@@ -66,13 +74,13 @@ public static void initTEAPPS (@Nonnull final IValidationExecutorSetRegistry <IV
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_TEAPPS_272,
                                                                            "TEAPPSXML " +
                                                                                            VID_TEAPPS_272.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource ("/external/schemas/TEAPPSXMLv272_schema_INVOICES.xsd",
                                                                                                                                 _getCL ()))));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_TEAPPS_30,
                                                                            "TEAPPSXML " +
                                                                                           VID_TEAPPS_30.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (new ClassPathResource ("/external/schemas/teappsxmlv30_schema_invoices_0.xsd",
                                                                                                                                 _getCL ()))));
   }
diff --git a/phive-rules-ubl/src/main/java/com/helger/phive/ubl/UBLValidation.java b/phive-rules-ubl/src/main/java/com/helger/phive/ubl/UBLValidation.java
index bb7359da..2b60f6b3 100644
--- a/phive-rules-ubl/src/main/java/com/helger/phive/ubl/UBLValidation.java
+++ b/phive-rules-ubl/src/main/java/com/helger/phive/ubl/UBLValidation.java
@@ -23,6 +23,8 @@
 import com.helger.diver.api.version.VESID;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.source.IValidationSourceXML;
 import com.helger.phive.xml.xsd.ValidationExecutorXSD;
@@ -660,6 +662,12 @@ public final class UBLValidation
   private UBLValidation ()
   {}
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard UBL validation execution sets to the provided
    * registry.
@@ -696,128 +704,128 @@ public static void initUBL20 (@Nonnull final IValidationExecutorSetRegistry <IVa
     // No Schematrons here
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_APPLICATIONRESPONSE,
                                                                            "UBL Application Response " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_ATTACHEDDOCUMENT,
                                                                            "UBL Attached Document " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllAttachedDocumentXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_BILLOFLADING,
                                                                            "UBL Bill Of Lading " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllBillOfLadingXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_CATALOGUE,
                                                                            "UBL Catalogue " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_CATALOGUEDELETION,
                                                                            "UBL Catalogue Deletion " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueDeletionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_CATALOGUEITEMSPECIFICATIONUPDATE,
                                                                            "UBL Catalogue Item Specification Update " +
                                                                                                                         VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_CATALOGUEPRICINGUPDATE,
                                                                            "UBL Catalogue Pricing Update " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllCataloguePricingUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_CATALOGUEREQUEST,
                                                                            "UBL Catalogue Request " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllCatalogueRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_CERTIFICATEOFORIGIN,
                                                                            "UBL Certificate Of Origin " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllCertificateOfOriginXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_CREDITNOTE,
                                                                            "UBL Credit Note " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_DEBITNOTE,
                                                                            "UBL Debit Note " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllDebitNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_DESPATCHADVICE,
                                                                            "UBL Despatch Advice " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllDespatchAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_FORWARDINGINSTRUCTIONS,
                                                                            "UBL Forwarding Instructions " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllForwardingInstructionsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_FREIGHTINVOICE,
                                                                            "UBL Freight Invoice " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllFreightInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_INVOICE,
                                                                            "UBL Invoice " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_ORDER,
                                                                            "UBL Order " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_ORDERCANCELLATION,
                                                                            "UBL Order Cancellation " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_ORDERCHANGE,
                                                                            "UBL Order Change " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderChangeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_ORDERRESPONSE,
                                                                            "UBL Order Response " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_ORDERRESPONSESIMPLE,
                                                                            "UBL Order Response Simple " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllOrderResponseSimpleXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_PACKINGLIST,
                                                                            "UBL Packing List " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllPackingListXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_QUOTATION,
                                                                            "UBL Quotation " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_RECEIPTADVICE,
                                                                            "UBL Receipt Advice " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllReceiptAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_REMINDER,
                                                                            "UBL Reminder " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllReminderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_REMITTANCEADVICE,
                                                                            "UBL Remittance Advice " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllRemittanceAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_REQUESTFORQUOTATION,
                                                                            "UBL Request For Quotation " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllRequestForQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_SELFBILLEDCREDITNOTE,
                                                                            "UBL Self Billed Credit Note " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllSelfBilledCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_SELFBILLEDINVOICE,
                                                                            "UBL Self Billed Invoice " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllSelfBilledInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_STATEMENT,
                                                                            "UBL Statement " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_TRANSPORTATIONSTATUS,
                                                                            "UBL Transportation Status " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllTransportationStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_20_WAYBILL,
                                                                            "UBL Waybill " + VERSION_20,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL20Marshaller.getAllWaybillXSDs ())));
   }
 
@@ -839,273 +847,273 @@ public static void initUBL21 (@Nonnull final IValidationExecutorSetRegistry <IVa
 
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_APPLICATIONRESPONSE,
                                                                            "UBL Application Response " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_ATTACHEDDOCUMENT,
                                                                            "UBL Attached Document " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllAttachedDocumentXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_AWARDEDNOTIFICATION,
                                                                            "UBL Awarded Notification " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllAwardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_BILLOFLADING,
                                                                            "UBL Bill Of Lading " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllBillOfLadingXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CALLFORTENDERS,
                                                                            "UBL Call For Tenders " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCallForTendersXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CATALOGUE,
                                                                            "UBL Catalogue " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CATALOGUEDELETION,
                                                                            "UBL Catalogue Deletion " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueDeletionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CATALOGUEITEMSPECIFICATIONUPDATE,
                                                                            "UBL Catalogue Item Specification Update " +
                                                                                                                         VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CATALOGUEPRICINGUPDATE,
                                                                            "UBL Catalogue Pricing Update " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCataloguePricingUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CATALOGUEREQUEST,
                                                                            "UBL Catalogue Request " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCatalogueRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CERTIFICATEOFORIGIN,
                                                                            "UBL Certificate Of Origin " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCertificateOfOriginXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CONTRACTAWARDNOTICE,
                                                                            "UBL Contract Award Notice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllContractAwardNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CONTRACTNOTICE,
                                                                            "UBL Contract Notice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllContractNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_CREDITNOTE,
                                                                            "UBL Credit Note " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_DEBITNOTE,
                                                                            "UBL Debit Note " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDebitNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_DESPATCHADVICE,
                                                                            "UBL Despatch Advice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDespatchAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_DOCUMENTSTATUS,
                                                                            "UBL Document Status " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDocumentStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_DOCUMENTSTATUSREQUEST,
                                                                            "UBL Document Status Request " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllDocumentStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_EXCEPTIONCRITERIA,
                                                                            "UBL Exception Criteria " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllExceptionCriteriaXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_EXCEPTIONNOTIFICATION,
                                                                            "UBL Exception Notification " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllExceptionNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_FORECAST,
                                                                            "UBL Forecast " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllForecastXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_FORECASTREVISION,
                                                                            "UBL Forecast Revision " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllForecastRevisionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_FORWARDINGINSTRUCTIONS,
                                                                            "UBL Forwarding Instructions " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllForwardingInstructionsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_FREIGHTINVOICE,
                                                                            "UBL Freight Invoice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllFreightInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_FULFILMENTCANCELLATION,
                                                                            "UBL Fulfilment Cancellation " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllFulfilmentCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_GOODSITEMITINERARY,
                                                                            "UBL Goods Item Itinerary " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllGoodsItemItineraryXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_GUARANTEECERTIFICATE,
                                                                            "UBL Guarantee Certificate " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllGuaranteeCertificateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_INSTRUCTIONFORRETURNS,
                                                                            "UBL Instruction For Returns " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInstructionForReturnsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_INVENTORYREPORT,
                                                                            "UBL Inventory Report " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInventoryReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_INVOICE,
                                                                            "UBL Invoice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_ITEMINFORMATIONREQUEST,
                                                                            "UBL Item Information Request " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllItemInformationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_ORDER,
                                                                            "UBL Order " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_ORDERCANCELLATION,
                                                                            "UBL Order Cancellation " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_ORDERCHANGE,
                                                                            "UBL Order Change " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderChangeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_ORDERRESPONSE,
                                                                            "UBL Order Response " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_ORDERRESPONSESIMPLE,
                                                                            "UBL Order Response Simple " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllOrderResponseSimpleXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_PACKINGLIST,
                                                                            "UBL Packing List " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllPackingListXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_PRIORINFORMATIONNOTICE,
                                                                            "UBL Prior Information Notice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllPriorInformationNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_PRODUCTACTIVITY,
                                                                            "UBL Product Activity " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllProductActivityXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_QUOTATION,
                                                                            "UBL Quotation " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_RECEIPTADVICE,
                                                                            "UBL Receipt Advice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllReceiptAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_REMINDER,
                                                                            "UBL Reminder " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllReminderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_REMITTANCEADVICE,
                                                                            "UBL Remittance Advice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllRemittanceAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_REQUESTFORQUOTATION,
                                                                            "UBL Request For Quotation " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllRequestForQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_RETAILEVENT,
                                                                            "UBL Retail Event " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllRetailEventXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_SELFBILLEDCREDITNOTE,
                                                                            "UBL Self Billed Credit Note " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllSelfBilledCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_SELFBILLEDINVOICE,
                                                                            "UBL Self Billed Invoice " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllSelfBilledInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_STATEMENT,
                                                                            "UBL Statement " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_STOCKAVAILABILITYREPORT,
                                                                            "UBL Stock Availability Report " +
                                                                                                                VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllStockAvailabilityReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TENDER,
                                                                            "UBL Tender " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTenderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TENDERERQUALIFICATION,
                                                                            "UBL Tenderer Qualification " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTendererQualificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TENDERERQUALIFICATIONRESPONSE,
                                                                            "UBL Tenderer Qualification Response " +
                                                                                                                      VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTendererQualificationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TENDERRECEIPT,
                                                                            "UBL Tender Receipt " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTenderReceiptXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRADEITEMLOCATIONPROFILE,
                                                                            "UBL Trade Item Location Profile " +
                                                                                                                 VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTradeItemLocationProfileXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTATIONSTATUS,
                                                                            "UBL Transportation Status " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportationStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTATIONSTATUSREQUEST,
                                                                            "UBL Transportation Status Request " +
                                                                                                                    VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportationStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTEXECUTIONPLAN,
                                                                            "UBL Transport Execution Plan " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportExecutionPlanXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTEXECUTIONPLANREQUEST,
                                                                            "UBL Transport Execution Plan Request " +
                                                                                                                      VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportExecutionPlanRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTPROGRESSSTATUS,
                                                                            "UBL Transport Progress Status " +
                                                                                                                VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportProgressStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTPROGRESSSTATUSREQUEST,
                                                                            "UBL Transport Progress Status Request " +
                                                                                                                       VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportProgressStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTSERVICEDESCRIPTION,
                                                                            "UBL Transport Service Description " +
                                                                                                                    VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportServiceDescriptionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_TRANSPORTSERVICEDESCRIPTIONREQUEST,
                                                                            "UBL Transport Service Description Request " +
                                                                                                                           VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllTransportServiceDescriptionRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_UNAWARDEDNOTIFICATION,
                                                                            "UBL Unawarded Notification " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllUnawardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_UTILITYSTATEMENT,
                                                                            "UBL Utility Statement " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllUtilityStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_21_WAYBILL,
                                                                            "UBL Waybill " + VERSION_21,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllWaybillXSDs ())));
   }
 
@@ -1127,343 +1135,343 @@ public static void initUBL22 (@Nonnull final IValidationExecutorSetRegistry <IVa
 
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_APPLICATIONRESPONSE,
                                                                            "UBL Application Response " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ATTACHEDDOCUMENT,
                                                                            "UBL Attached Document " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllAttachedDocumentXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_AWARDEDNOTIFICATION,
                                                                            "UBL Awarded Notification " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllAwardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_BILLOFLADING,
                                                                            "UBL Bill Of Lading " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllBillOfLadingXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_BUSINESSCARD,
                                                                            "UBL Business Card " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllBusinessCardXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CALLFORTENDERS,
                                                                            "UBL Call For Tenders " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCallForTendersXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CATALOGUE,
                                                                            "UBL Catalogue " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CATALOGUEDELETION,
                                                                            "UBL Catalogue Deletion " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueDeletionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CATALOGUEITEMSPECIFICATIONUPDATE,
                                                                            "UBL Catalogue Item Specification Update " +
                                                                                                                         VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CATALOGUEPRICINGUPDATE,
                                                                            "UBL Catalogue Pricing Update " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCataloguePricingUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CATALOGUEREQUEST,
                                                                            "UBL Catalogue Request " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCatalogueRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CERTIFICATEOFORIGIN,
                                                                            "UBL Certificate Of Origin " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCertificateOfOriginXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CONTRACTAWARDNOTICE,
                                                                            "UBL Contract Award Notice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllContractAwardNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CONTRACTNOTICE,
                                                                            "UBL Contract Notice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllContractNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_CREDITNOTE,
                                                                            "UBL Credit Note " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_DEBITNOTE,
                                                                            "UBL Debit Note " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDebitNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_DESPATCHADVICE,
                                                                            "UBL Despatch Advice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDespatchAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_DIGITALAGREEMENT,
                                                                            "UBL Digital Agreement " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDigitalAgreementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_DIGITALCAPABILITY,
                                                                            "UBL Digital Capability " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDigitalCapabilityXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_DOCUMENTSTATUS,
                                                                            "UBL Document Status " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDocumentStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_DOCUMENTSTATUSREQUEST,
                                                                            "UBL Document Status Request " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllDocumentStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ENQUIRY,
                                                                            "UBL Enquiry " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllEnquiryXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ENQUIRYRESPONSE,
                                                                            "UBL Enquiry Response " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllEnquiryResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_EXCEPTIONCRITERIA,
                                                                            "UBL Exception Criteria " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllExceptionCriteriaXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_EXCEPTIONNOTIFICATION,
                                                                            "UBL Exception Notification " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllExceptionNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_EXPRESSIONOFINTERESTREQUEST,
                                                                            "UBL Expression Of Interest Request " +
                                                                                                                    VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllExpressionOfInterestRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_EXPRESSIONOFINTERESTRESPONSE,
                                                                            "UBL Expression Of Interest Response " +
                                                                                                                     VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllExpressionOfInterestResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_FORECAST,
                                                                            "UBL Forecast " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllForecastXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_FORECASTREVISION,
                                                                            "UBL Forecast Revision " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllForecastRevisionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_FORWARDINGINSTRUCTIONS,
                                                                            "UBL Forwarding Instructions " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllForwardingInstructionsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_FREIGHTINVOICE,
                                                                            "UBL Freight Invoice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllFreightInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_FULFILMENTCANCELLATION,
                                                                            "UBL Fulfilment Cancellation " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllFulfilmentCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_GOODSITEMITINERARY,
                                                                            "UBL Goods Item Itinerary " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllGoodsItemItineraryXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_GUARANTEECERTIFICATE,
                                                                            "UBL Guarantee Certificate " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllGuaranteeCertificateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_INSTRUCTIONFORRETURNS,
                                                                            "UBL Instruction For Returns " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInstructionForReturnsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_INVENTORYREPORT,
                                                                            "UBL Inventory Report " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInventoryReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_INVOICE,
                                                                            "UBL Invoice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ITEMINFORMATIONREQUEST,
                                                                            "UBL Item Information Request " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllItemInformationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ORDER,
                                                                            "UBL Order " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ORDERCANCELLATION,
                                                                            "UBL Order Cancellation " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ORDERCHANGE,
                                                                            "UBL Order Change " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderChangeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ORDERRESPONSE,
                                                                            "UBL Order Response " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_ORDERRESPONSESIMPLE,
                                                                            "UBL Order Response Simple " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllOrderResponseSimpleXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_PACKINGLIST,
                                                                            "UBL Packing List " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllPackingListXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_PRIORINFORMATIONNOTICE,
                                                                            "UBL Prior Information Notice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllPriorInformationNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_PRODUCTACTIVITY,
                                                                            "UBL Product Activity " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllProductActivityXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_QUALIFICATIONAPPLICATIONREQUEST,
                                                                            "UBL Qualification Application Request " +
                                                                                                                        VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllQualificationApplicationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_QUALIFICATIONAPPLICATIONRESPONSE,
                                                                            "UBL Qualification Application Response " +
                                                                                                                         VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllQualificationApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_QUOTATION,
                                                                            "UBL Quotation " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_RECEIPTADVICE,
                                                                            "UBL Receipt Advice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllReceiptAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_REMINDER,
                                                                            "UBL Reminder " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllReminderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_REMITTANCEADVICE,
                                                                            "UBL Remittance Advice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllRemittanceAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_REQUESTFORQUOTATION,
                                                                            "UBL Request For Quotation " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllRequestForQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_RETAILEVENT,
                                                                            "UBL Retail Event " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllRetailEventXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_SELFBILLEDCREDITNOTE,
                                                                            "UBL Self Billed Credit Note " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllSelfBilledCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_SELFBILLEDINVOICE,
                                                                            "UBL Self Billed Invoice " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllSelfBilledInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_STATEMENT,
                                                                            "UBL Statement " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_STOCKAVAILABILITYREPORT,
                                                                            "UBL Stock Availability Report " +
                                                                                                                VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllStockAvailabilityReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDER,
                                                                            "UBL Tender " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTenderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDERCONTRACT,
                                                                            "UBL Tender Contract " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTenderContractXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDERERQUALIFICATION,
                                                                            "UBL Tenderer Qualification " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTendererQualificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDERERQUALIFICATIONRESPONSE,
                                                                            "UBL Tenderer Qualification Response " +
                                                                                                                      VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTendererQualificationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDERRECEIPT,
                                                                            "UBL Tender Receipt " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTenderReceiptXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDERSTATUS,
                                                                            "UBL Tender Status " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTenderStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDERSTATUSREQUEST,
                                                                            "UBL Tender Status Request " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTenderStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TENDERWITHDRAWAL,
                                                                            "UBL Tender Withdrawal " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTenderWithdrawalXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRADEITEMLOCATIONPROFILE,
                                                                            "UBL Trade Item Location Profile " +
                                                                                                                 VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTradeItemLocationProfileXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTATIONSTATUS,
                                                                            "UBL Transportation Status " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportationStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTATIONSTATUSREQUEST,
                                                                            "UBL Transportation Status Request " +
                                                                                                                    VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportationStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTEXECUTIONPLAN,
                                                                            "UBL Transport Execution Plan " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportExecutionPlanXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTEXECUTIONPLANREQUEST,
                                                                            "UBL Transport Execution Plan Request " +
                                                                                                                      VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportExecutionPlanRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTPROGRESSSTATUS,
                                                                            "UBL Transport Progress Status " +
                                                                                                                VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportProgressStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTPROGRESSSTATUSREQUEST,
                                                                            "UBL Transport Progress Status Request " +
                                                                                                                       VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportProgressStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTSERVICEDESCRIPTION,
                                                                            "UBL Transport Service Description " +
                                                                                                                    VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportServiceDescriptionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_TRANSPORTSERVICEDESCRIPTIONREQUEST,
                                                                            "UBL Transport Service Description Request " +
                                                                                                                           VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllTransportServiceDescriptionRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_UNAWARDEDNOTIFICATION,
                                                                            "UBL Unawarded Notification " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllUnawardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_UNSUBSCRIBEFROMPROCEDUREREQUEST,
                                                                            "UBL Unsubscribe From Procedure Request " +
                                                                                                                        VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllUnsubscribeFromProcedureRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_UNSUBSCRIBEFROMPROCEDURERESPONSE,
                                                                            "UBL Unsubscribe From Procedure Response " +
                                                                                                                         VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllUnsubscribeFromProcedureResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_UTILITYSTATEMENT,
                                                                            "UBL Utility Statement " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllUtilityStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_WAYBILL,
                                                                            "UBL Waybill " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllWaybillXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_22_WEIGHTSTATEMENT,
                                                                            "UBL Weight Statement " + VERSION_22,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL22Marshaller.getAllWeightStatementXSDs ())));
   }
 
@@ -1485,389 +1493,389 @@ public static void initUBL23 (@Nonnull final IValidationExecutorSetRegistry <IVa
 
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_APPLICATIONRESPONSE,
                                                                            "UBL Application Response " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ATTACHEDDOCUMENT,
                                                                            "UBL Attached Document " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllAttachedDocumentXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_AWARDEDNOTIFICATION,
                                                                            "UBL Awarded Notification " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllAwardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_BILLOFLADING,
                                                                            "UBL Bill Of Lading " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllBillOfLadingXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_BUSINESSCARD,
                                                                            "UBL Business Card " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllBusinessCardXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CALLFORTENDERS,
                                                                            "UBL Call For Tenders " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCallForTendersXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CATALOGUE,
                                                                            "UBL Catalogue " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCatalogueXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CATALOGUEDELETION,
                                                                            "UBL Catalogue Deletion " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCatalogueDeletionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CATALOGUEITEMSPECIFICATIONUPDATE,
                                                                            "UBL Catalogue Item Specification Update " +
                                                                                                                         VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CATALOGUEPRICINGUPDATE,
                                                                            "UBL Catalogue Pricing Update " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCataloguePricingUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CATALOGUEREQUEST,
                                                                            "UBL Catalogue Request " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCatalogueRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CERTIFICATEOFORIGIN,
                                                                            "UBL Certificate Of Origin " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCertificateOfOriginXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_COMMONTRANSPORTATIONREPORT,
                                                                            "UBL Common Transportation Report " +
                                                                                                                   VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCommonTransportationReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CONTRACTAWARDNOTICE,
                                                                            "UBL Contract Award Notice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllContractAwardNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CONTRACTNOTICE,
                                                                            "UBL Contract Notice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllContractNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_CREDITNOTE,
                                                                            "UBL Credit Note " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_DEBITNOTE,
                                                                            "UBL Debit Note " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllDebitNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_DESPATCHADVICE,
                                                                            "UBL Despatch Advice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllDespatchAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_DIGITALAGREEMENT,
                                                                            "UBL Digital Agreement " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllDigitalAgreementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_DIGITALCAPABILITY,
                                                                            "UBL Digital Capability " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllDigitalCapabilityXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_DOCUMENTSTATUS,
                                                                            "UBL Document Status " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllDocumentStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_DOCUMENTSTATUSREQUEST,
                                                                            "UBL Document Status Request " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllDocumentStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ENQUIRY,
                                                                            "UBL Enquiry " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllEnquiryXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ENQUIRYRESPONSE,
                                                                            "UBL Enquiry Response " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllEnquiryResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_EXCEPTIONCRITERIA,
                                                                            "UBL Exception Criteria " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllExceptionCriteriaXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_EXCEPTIONNOTIFICATION,
                                                                            "UBL Exception Notification " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllExceptionNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_EXPORTCUSTOMSDECLARATION,
                                                                            "UBL Export Customs Declaration " +
                                                                                                                 VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllExportCustomsDeclarationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_EXPRESSIONOFINTERESTREQUEST,
                                                                            "UBL Expression Of Interest Request " +
                                                                                                                    VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllExpressionOfInterestRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_EXPRESSIONOFINTERESTRESPONSE,
                                                                            "UBL Expression Of Interest Response " +
                                                                                                                     VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllExpressionOfInterestResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_FORECAST,
                                                                            "UBL Forecast " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllForecastXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_FORECASTREVISION,
                                                                            "UBL Forecast Revision " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllForecastRevisionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_FORWARDINGINSTRUCTIONS,
                                                                            "UBL Forwarding Instructions " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllForwardingInstructionsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_FREIGHTINVOICE,
                                                                            "UBL Freight Invoice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllFreightInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_FULFILMENTCANCELLATION,
                                                                            "UBL Fulfilment Cancellation " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllFulfilmentCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_GOODSCERTIFICATE,
                                                                            "UBL Goods Certificate " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllGoodsCertificateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_GOODSITEMITINERARY,
                                                                            "UBL Goods Item Itinerary " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllGoodsItemItineraryXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_GOODSITEMPASSPORT,
                                                                            "UBL Goods Item Passport " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllGoodsItemPassportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_GUARANTEECERTIFICATE,
                                                                            "UBL Guarantee Certificate " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllGuaranteeCertificateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_IMPORTCUSTOMSDECLARATION,
                                                                            "UBL Import Customs Declaration " +
                                                                                                                 VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllImportCustomsDeclarationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_INSTRUCTIONFORRETURNS,
                                                                            "UBL Instruction For Returns " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllInstructionForReturnsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_INVENTORYREPORT,
                                                                            "UBL Inventory Report " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllInventoryReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_INVOICE,
                                                                            "UBL Invoice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ITEMINFORMATIONREQUEST,
                                                                            "UBL Item Information Request " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllItemInformationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_MANIFEST,
                                                                            "UBL Manifest " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllManifestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ORDER,
                                                                            "UBL Order " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ORDERCANCELLATION,
                                                                            "UBL Order Cancellation " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ORDERCHANGE,
                                                                            "UBL Order Change " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderChangeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ORDERRESPONSE,
                                                                            "UBL Order Response " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_ORDERRESPONSESIMPLE,
                                                                            "UBL Order Response Simple " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllOrderResponseSimpleXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_PACKINGLIST,
                                                                            "UBL Packing List " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllPackingListXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_PRIORINFORMATIONNOTICE,
                                                                            "UBL Prior Information Notice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllPriorInformationNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_PRODUCTACTIVITY,
                                                                            "UBL Product Activity " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllProductActivityXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_PROOFOFREEXPORTATION,
                                                                            "UBL Proof Of Reexportation " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllProofOfReexportationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_PROOFOFREEXPORTATIONREMINDER,
                                                                            "UBL Proof Of Reexportation Reminder " +
                                                                                                                     VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllProofOfReexportationReminderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_PROOFOFREEXPORTATIONREQUEST,
                                                                            "UBL Proof Of Reexportation Request " +
                                                                                                                    VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllProofOfReexportationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_QUALIFICATIONAPPLICATIONREQUEST,
                                                                            "UBL Qualification Application Request " +
                                                                                                                        VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllQualificationApplicationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_QUALIFICATIONAPPLICATIONRESPONSE,
                                                                            "UBL Qualification Application Response " +
                                                                                                                         VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllQualificationApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_QUOTATION,
                                                                            "UBL Quotation " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_RECEIPTADVICE,
                                                                            "UBL Receipt Advice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllReceiptAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_REMINDER,
                                                                            "UBL Reminder " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllReminderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_REMITTANCEADVICE,
                                                                            "UBL Remittance Advice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllRemittanceAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_REQUESTFORQUOTATION,
                                                                            "UBL Request For Quotation " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllRequestForQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_RETAILEVENT,
                                                                            "UBL Retail Event " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllRetailEventXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_SELFBILLEDCREDITNOTE,
                                                                            "UBL Self Billed Credit Note " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllSelfBilledCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_SELFBILLEDINVOICE,
                                                                            "UBL Self Billed Invoice " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllSelfBilledInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_STATEMENT,
                                                                            "UBL Statement " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_STOCKAVAILABILITYREPORT,
                                                                            "UBL Stock Availability Report " +
                                                                                                                VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllStockAvailabilityReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDER,
                                                                            "UBL Tender " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTenderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDERCONTRACT,
                                                                            "UBL Tender Contract " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTenderContractXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDERERQUALIFICATION,
                                                                            "UBL Tenderer Qualification " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTendererQualificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDERERQUALIFICATIONRESPONSE,
                                                                            "UBL Tenderer Qualification Response " +
                                                                                                                      VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTendererQualificationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDERRECEIPT,
                                                                            "UBL Tender Receipt " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTenderReceiptXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDERSTATUS,
                                                                            "UBL Tender Status " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTenderStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDERSTATUSREQUEST,
                                                                            "UBL Tender Status Request " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTenderStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TENDERWITHDRAWAL,
                                                                            "UBL Tender Withdrawal " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTenderWithdrawalXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRADEITEMLOCATIONPROFILE,
                                                                            "UBL Trade Item Location Profile " +
                                                                                                                 VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTradeItemLocationProfileXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSITCUSTOMSDECLARATION,
                                                                            "UBL Transit Customs Declaration " +
                                                                                                                  VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransitCustomsDeclarationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTATIONSTATUS,
                                                                            "UBL Transportation Status " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportationStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTATIONSTATUSREQUEST,
                                                                            "UBL Transportation Status Request " +
                                                                                                                    VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportationStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTEXECUTIONPLAN,
                                                                            "UBL Transport Execution Plan " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportExecutionPlanXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTEXECUTIONPLANREQUEST,
                                                                            "UBL Transport Execution Plan Request " +
                                                                                                                      VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportExecutionPlanRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTPROGRESSSTATUS,
                                                                            "UBL Transport Progress Status " +
                                                                                                                VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportProgressStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTPROGRESSSTATUSREQUEST,
                                                                            "UBL Transport Progress Status Request " +
                                                                                                                       VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportProgressStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTSERVICEDESCRIPTION,
                                                                            "UBL Transport Service Description " +
                                                                                                                    VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportServiceDescriptionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_TRANSPORTSERVICEDESCRIPTIONREQUEST,
                                                                            "UBL Transport Service Description Request " +
                                                                                                                           VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllTransportServiceDescriptionRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_UNAWARDEDNOTIFICATION,
                                                                            "UBL Unawarded Notification " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllUnawardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_UNSUBSCRIBEFROMPROCEDUREREQUEST,
                                                                            "UBL Unsubscribe From Procedure Request " +
                                                                                                                        VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllUnsubscribeFromProcedureRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_UNSUBSCRIBEFROMPROCEDURERESPONSE,
                                                                            "UBL Unsubscribe From Procedure Response " +
                                                                                                                         VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllUnsubscribeFromProcedureResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_UTILITYSTATEMENT,
                                                                            "UBL Utility Statement " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllUtilityStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_WAYBILL,
                                                                            "UBL Waybill " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllWaybillXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_23_WEIGHTSTATEMENT,
                                                                            "UBL Weight Statement " + VERSION_23,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL23Marshaller.getAllWeightStatementXSDs ())));
   }
 
@@ -1889,397 +1897,397 @@ public static void initUBL24 (@Nonnull final IValidationExecutorSetRegistry <IVa
 
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_APPLICATIONRESPONSE,
                                                                            "UBL Application Response " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ATTACHEDDOCUMENT,
                                                                            "UBL Attached Document " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllAttachedDocumentXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_AWARDEDNOTIFICATION,
                                                                            "UBL Awarded Notification " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllAwardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_BILLOFLADING,
                                                                            "UBL Bill Of Lading " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllBillOfLadingXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_BUSINESSCARD,
                                                                            "UBL Business Card " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllBusinessCardXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_BUSINESSINFORMATION,
                                                                            "UBL Business Information " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllBusinessInformationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CALLFORTENDERS,
                                                                            "UBL Call For Tenders " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCallForTendersXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CATALOGUE,
                                                                            "UBL Catalogue " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCatalogueXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CATALOGUEDELETION,
                                                                            "UBL Catalogue Deletion " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCatalogueDeletionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CATALOGUEITEMSPECIFICATIONUPDATE,
                                                                            "UBL Catalogue Item Specification Update " +
                                                                                                                         VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCatalogueItemSpecificationUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CATALOGUEPRICINGUPDATE,
                                                                            "UBL Catalogue Pricing Update " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCataloguePricingUpdateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CATALOGUEREQUEST,
                                                                            "UBL Catalogue Request " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCatalogueRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CERTIFICATEOFORIGIN,
                                                                            "UBL Certificate Of Origin " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCertificateOfOriginXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_COMMONTRANSPORTATIONREPORT,
                                                                            "UBL Common Transportation Report " +
                                                                                                                   VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCommonTransportationReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CONTRACTAWARDNOTICE,
                                                                            "UBL Contract Award Notice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllContractAwardNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CONTRACTNOTICE,
                                                                            "UBL Contract Notice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllContractNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_CREDITNOTE,
                                                                            "UBL Credit Note " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_DEBITNOTE,
                                                                            "UBL Debit Note " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllDebitNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_DESPATCHADVICE,
                                                                            "UBL Despatch Advice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllDespatchAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_DIGITALAGREEMENT,
                                                                            "UBL Digital Agreement " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllDigitalAgreementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_DIGITALCAPABILITY,
                                                                            "UBL Digital Capability " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllDigitalCapabilityXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_DOCUMENTSTATUS,
                                                                            "UBL Document Status " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllDocumentStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_DOCUMENTSTATUSREQUEST,
                                                                            "UBL Document Status Request " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllDocumentStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ENQUIRY,
                                                                            "UBL Enquiry " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllEnquiryXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ENQUIRYRESPONSE,
                                                                            "UBL Enquiry Response " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllEnquiryResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_EXCEPTIONCRITERIA,
                                                                            "UBL Exception Criteria " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllExceptionCriteriaXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_EXCEPTIONNOTIFICATION,
                                                                            "UBL Exception Notification " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllExceptionNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_EXPORTCUSTOMSDECLARATION,
                                                                            "UBL Export Customs Declaration " +
                                                                                                                 VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllExportCustomsDeclarationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_EXPRESSIONOFINTERESTREQUEST,
                                                                            "UBL Expression Of Interest Request " +
                                                                                                                    VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllExpressionOfInterestRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_EXPRESSIONOFINTERESTRESPONSE,
                                                                            "UBL Expression Of Interest Response " +
                                                                                                                     VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllExpressionOfInterestResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_FORECAST,
                                                                            "UBL Forecast " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllForecastXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_FORECASTREVISION,
                                                                            "UBL Forecast Revision " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllForecastRevisionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_FORWARDINGINSTRUCTIONS,
                                                                            "UBL Forwarding Instructions " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllForwardingInstructionsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_FREIGHTINVOICE,
                                                                            "UBL Freight Invoice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllFreightInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_FULFILMENTCANCELLATION,
                                                                            "UBL Fulfilment Cancellation " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllFulfilmentCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_GOODSCERTIFICATE,
                                                                            "UBL Goods Certificate " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllGoodsCertificateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_GOODSITEMITINERARY,
                                                                            "UBL Goods Item Itinerary " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllGoodsItemItineraryXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_GOODSITEMPASSPORT,
                                                                            "UBL Goods Item Passport " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllGoodsItemPassportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_GUARANTEECERTIFICATE,
                                                                            "UBL Guarantee Certificate " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllGuaranteeCertificateXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_IMPORTCUSTOMSDECLARATION,
                                                                            "UBL Import Customs Declaration " +
                                                                                                                 VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllImportCustomsDeclarationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_INSTRUCTIONFORRETURNS,
                                                                            "UBL Instruction For Returns " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllInstructionForReturnsXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_INVENTORYREPORT,
                                                                            "UBL Inventory Report " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllInventoryReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_INVOICE,
                                                                            "UBL Invoice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ITEMINFORMATIONREQUEST,
                                                                            "UBL Item Information Request " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllItemInformationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_MANIFEST,
                                                                            "UBL Manifest " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllManifestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ORDER,
                                                                            "UBL Order " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllOrderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ORDERCANCELLATION,
                                                                            "UBL Order Cancellation " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllOrderCancellationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ORDERCHANGE,
                                                                            "UBL Order Change " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllOrderChangeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ORDERRESPONSE,
                                                                            "UBL Order Response " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllOrderResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_ORDERRESPONSESIMPLE,
                                                                            "UBL Order Response Simple " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllOrderResponseSimpleXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_PACKINGLIST,
                                                                            "UBL Packing List " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllPackingListXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_PRIORINFORMATIONNOTICE,
                                                                            "UBL Prior Information Notice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllPriorInformationNoticeXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_PRODUCTACTIVITY,
                                                                            "UBL Product Activity " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllProductActivityXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_PROOFOFREEXPORTATION,
                                                                            "UBL Proof Of Reexportation " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllProofOfReexportationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_PROOFOFREEXPORTATIONREMINDER,
                                                                            "UBL Proof Of Reexportation Reminder " +
                                                                                                                     VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllProofOfReexportationReminderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_PROOFOFREEXPORTATIONREQUEST,
                                                                            "UBL Proof Of Reexportation Request " +
                                                                                                                    VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllProofOfReexportationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_PURCHASERECEIPT,
                                                                            "UBL Purchase Receipt " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllPurchaseReceiptXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_QUALIFICATIONAPPLICATIONREQUEST,
                                                                            "UBL Qualification Application Request " +
                                                                                                                        VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllQualificationApplicationRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_QUALIFICATIONAPPLICATIONRESPONSE,
                                                                            "UBL Qualification Application Response " +
                                                                                                                         VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllQualificationApplicationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_QUOTATION,
                                                                            "UBL Quotation " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_RECEIPTADVICE,
                                                                            "UBL Receipt Advice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllReceiptAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_REMINDER,
                                                                            "UBL Reminder " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllReminderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_REMITTANCEADVICE,
                                                                            "UBL Remittance Advice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllRemittanceAdviceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_REQUESTFORQUOTATION,
                                                                            "UBL Request For Quotation " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllRequestForQuotationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_RETAILEVENT,
                                                                            "UBL Retail Event " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllRetailEventXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_SELFBILLEDCREDITNOTE,
                                                                            "UBL Self Billed Credit Note " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllSelfBilledCreditNoteXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_SELFBILLEDINVOICE,
                                                                            "UBL Self Billed Invoice " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllSelfBilledInvoiceXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_STATEMENT,
                                                                            "UBL Statement " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_STOCKAVAILABILITYREPORT,
                                                                            "UBL Stock Availability Report " +
                                                                                                                VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllStockAvailabilityReportXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDER,
                                                                            "UBL Tender " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTenderXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDERCONTRACT,
                                                                            "UBL Tender Contract " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTenderContractXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDERERQUALIFICATION,
                                                                            "UBL Tenderer Qualification " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTendererQualificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDERERQUALIFICATIONRESPONSE,
                                                                            "UBL Tenderer Qualification Response " +
                                                                                                                      VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTendererQualificationResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDERRECEIPT,
                                                                            "UBL Tender Receipt " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTenderReceiptXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDERSTATUS,
                                                                            "UBL Tender Status " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTenderStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDERSTATUSREQUEST,
                                                                            "UBL Tender Status Request " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTenderStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TENDERWITHDRAWAL,
                                                                            "UBL Tender Withdrawal " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTenderWithdrawalXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRADEITEMLOCATIONPROFILE,
                                                                            "UBL Trade Item Location Profile " +
                                                                                                                 VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTradeItemLocationProfileXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSITCUSTOMSDECLARATION,
                                                                            "UBL Transit Customs Declaration " +
                                                                                                                  VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransitCustomsDeclarationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTATIONSTATUS,
                                                                            "UBL Transportation Status " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportationStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTATIONSTATUSREQUEST,
                                                                            "UBL Transportation Status Request " +
                                                                                                                    VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportationStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTEXECUTIONPLAN,
                                                                            "UBL Transport Execution Plan " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportExecutionPlanXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTEXECUTIONPLANREQUEST,
                                                                            "UBL Transport Execution Plan Request " +
                                                                                                                      VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportExecutionPlanRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTPROGRESSSTATUS,
                                                                            "UBL Transport Progress Status " +
                                                                                                                VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportProgressStatusXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTPROGRESSSTATUSREQUEST,
                                                                            "UBL Transport Progress Status Request " +
                                                                                                                       VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportProgressStatusRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTSERVICEDESCRIPTION,
                                                                            "UBL Transport Service Description " +
                                                                                                                    VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportServiceDescriptionXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_TRANSPORTSERVICEDESCRIPTIONREQUEST,
                                                                            "UBL Transport Service Description Request " +
                                                                                                                           VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllTransportServiceDescriptionRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_UNAWARDEDNOTIFICATION,
                                                                            "UBL Unawarded Notification " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllUnawardedNotificationXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_UNSUBSCRIBEFROMPROCEDUREREQUEST,
                                                                            "UBL Unsubscribe From Procedure Request " +
                                                                                                                        VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllUnsubscribeFromProcedureRequestXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_UNSUBSCRIBEFROMPROCEDURERESPONSE,
                                                                            "UBL Unsubscribe From Procedure Response " +
                                                                                                                         VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllUnsubscribeFromProcedureResponseXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_UTILITYSTATEMENT,
                                                                            "UBL Utility Statement " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllUtilityStatementXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_WAYBILL,
                                                                            "UBL Waybill " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllWaybillXSDs ())));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_24_WEIGHTSTATEMENT,
                                                                            "UBL Weight Statement " + VERSION_24,
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL24Marshaller.getAllWeightStatementXSDs ())));
   }
 }
diff --git a/phive-rules-ublbe/src/main/java/com/helger/phive/ublbe/UBLBEValidation.java b/phive-rules-ublbe/src/main/java/com/helger/phive/ublbe/UBLBEValidation.java
index 1981b604..23304d6b 100644
--- a/phive-rules-ublbe/src/main/java/com/helger/phive/ublbe/UBLBEValidation.java
+++ b/phive-rules-ublbe/src/main/java/com/helger/phive/ublbe/UBLBEValidation.java
@@ -26,6 +26,8 @@
 import com.helger.phive.api.executorset.IValidationExecutorSet;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.peppol.legacy.PeppolValidation370;
 import com.helger.phive.xml.schematron.SchematronNamespaceBeautifier;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
@@ -158,6 +160,12 @@ private static ValidationExecutorSchematron _createXSLT (@Nonnull final IReadabl
     return ValidationExecutorSchematron.createXSLT (aRes, UBL21NamespaceContext.getInstance ());
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard e-FFF/UBL.BE validation execution sets to the
    * provided registry.
@@ -183,13 +191,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
                                                                                   VID_EFFF_INVOICE,
                                                                                   "e-FFF Invoice " +
                                                                                                     VID_EFFF_INVOICE.getVersionString (),
-                                                                                  bDeprecated,
+                                                                                  _createStatus (bDeprecated),
                                                                                   _createXSLT (BE_EFFF_300)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.createDerived (aVESCreditNoteBIS2,
                                                                                   VID_EFFF_CREDIT_NOTE,
                                                                                   "e-FFF Credit Note " +
                                                                                                         VID_EFFF_CREDIT_NOTE.getVersionString (),
-                                                                                  bDeprecated,
+                                                                                  _createStatus (bDeprecated),
                                                                                   _createXSLT (BE_EFFF_300)));
 
     // Not derived
@@ -197,13 +205,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_100,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_100.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_100)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_100,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_100.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_100)));
 
@@ -211,13 +219,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_110,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_110.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_110)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_110,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_110.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_110)));
 
@@ -225,13 +233,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_120,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_120.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_120)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_120,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_120.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_120)));
 
@@ -239,13 +247,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_123,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_123.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_123)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_123,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_123.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_123)));
 
@@ -253,13 +261,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_125,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_125.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_125)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_125,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_125.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_125)));
 
@@ -267,13 +275,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_126,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_126.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_126)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_126,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_126.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_126)));
 
@@ -281,13 +289,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_127,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_127.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_127)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_127,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_127.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_127)));
 
@@ -295,13 +303,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_128,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_128.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_128)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_128,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_128.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_128)));
 
@@ -309,13 +317,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_129,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_129.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_129)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_129,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_129.getVersionString (),
-                                                                           bDeprecated,
+                                                                           _createStatus (bDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_129)));
 
@@ -323,13 +331,13 @@ public static void initUBLBE (@Nonnull final IValidationExecutorSetRegistry <IVa
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_INVOICE_130,
                                                                            "UBL.BE Invoice " +
                                                                                                    VID_UBL_BE_INVOICE_130.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                            _createXSLT (UBL_BE_130)));
     aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_UBL_BE_CREDIT_NOTE_130,
                                                                            "UBL.BE Credit Note " +
                                                                                                        VID_UBL_BE_CREDIT_NOTE_130.getVersionString (),
-                                                                           bNotDeprecated,
+                                                                           _createStatus (bNotDeprecated),
                                                                            ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                            _createXSLT (UBL_BE_130)));
   }
diff --git a/phive-rules-xrechnung/src/main/java/com/helger/phive/xrechnung/XRechnungValidation.java b/phive-rules-xrechnung/src/main/java/com/helger/phive/xrechnung/XRechnungValidation.java
index 08080a34..4b16f1e7 100644
--- a/phive-rules-xrechnung/src/main/java/com/helger/phive/xrechnung/XRechnungValidation.java
+++ b/phive-rules-xrechnung/src/main/java/com/helger/phive/xrechnung/XRechnungValidation.java
@@ -30,6 +30,8 @@
 import com.helger.phive.api.executorset.IValidationExecutorSet;
 import com.helger.phive.api.executorset.IValidationExecutorSetRegistry;
 import com.helger.phive.api.executorset.ValidationExecutorSet;
+import com.helger.phive.api.executorset.status.IValidationExecutorSetStatus;
+import com.helger.phive.api.executorset.status.ValidationExecutorSetStatus;
 import com.helger.phive.en16931.EN16931Validation;
 import com.helger.phive.xml.schematron.ValidationExecutorSchematron;
 import com.helger.phive.xml.source.IValidationSourceXML;
@@ -120,6 +122,12 @@ private static ClassLoader _getCL ()
     return XRechnungValidation.class.getClassLoader ();
   }
 
+  @Nonnull
+  private static IValidationExecutorSetStatus _createStatus (final boolean bIsDeprecated)
+  {
+    return ValidationExecutorSetStatus.createDeprecatedNow (bIsDeprecated);
+  }
+
   /**
    * Register all standard XRechnung validation execution sets to the provided
    * registry. Make sure to register the EN16931 artefacts before you register
@@ -164,7 +172,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_CII_120,
                                                                                     "XRechnung CII " +
                                                                                                            VID_XRECHNUNG_CII_120.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.0/XRechnung-CII-validation.xslt",
                                                                                                                                                     _getCL ()),
@@ -173,7 +181,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_UBL_CREDITNOTE_120,
                                                                                     "XRechnung UBL Credit Note " +
                                                                                                                       VID_XRECHNUNG_UBL_CREDITNOTE_120.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.0/XRechnung-UBL-validation-CreditNote.xslt",
                                                                                                                                                     _getCL ()),
@@ -182,7 +190,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_UBL_INVOICE_120,
                                                                                     "XRechnung UBL Invoice " +
                                                                                                                    VID_XRECHNUNG_UBL_INVOICE_120.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.0/XRechnung-UBL-validation-Invoice.xslt",
                                                                                                                                                     _getCL ()),
@@ -195,7 +203,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_CII_121,
                                                                                     "XRechnung CII " +
                                                                                                            VID_XRECHNUNG_CII_121.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.1/XRechnung-CII-validation.xslt",
                                                                                                                                                     _getCL ()),
@@ -204,7 +212,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_UBL_CREDITNOTE_121,
                                                                                     "XRechnung UBL Credit Note " +
                                                                                                                       VID_XRECHNUNG_UBL_CREDITNOTE_121.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.1/XRechnung-UBL-validation-CreditNote.xslt",
                                                                                                                                                     _getCL ()),
@@ -213,7 +221,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_UBL_INVOICE_121,
                                                                                     "XRechnung UBL Invoice " +
                                                                                                                    VID_XRECHNUNG_UBL_INVOICE_121.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.1/XRechnung-UBL-validation-Invoice.xslt",
                                                                                                                                                     _getCL ()),
@@ -226,7 +234,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_CII_122,
                                                                                     "XRechnung CII " +
                                                                                                            VID_XRECHNUNG_CII_122.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.2/XRechnung-CII-validation.xslt",
                                                                                                                                                     _getCL ()),
@@ -235,7 +243,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_UBL_CREDITNOTE_122,
                                                                                     "XRechnung UBL Credit Note " +
                                                                                                                       VID_XRECHNUNG_UBL_CREDITNOTE_122.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.2/XRechnung-UBL-validation-CreditNote.xslt",
                                                                                                                                                     _getCL ()),
@@ -244,7 +252,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
                                                                                     VID_XRECHNUNG_UBL_INVOICE_122,
                                                                                     "XRechnung UBL Invoice " +
                                                                                                                    VID_XRECHNUNG_UBL_INVOICE_122.getVersionString (),
-                                                                                    bDeprecated,
+                                                                                    _createStatus (bDeprecated),
                                                                                     ValidationExecutorSchematron.createXSLT (new ClassPathResource (sPrefix +
                                                                                                                                                     "1.2.2/XRechnung-UBL-validation-Invoice.xslt",
                                                                                                                                                     _getCL ()),
@@ -261,7 +269,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_CII_200,
                                                                              "XRechnung CII " +
                                                                                                     VID_XRECHNUNG_CII_200.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_CII_132_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -273,7 +281,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_CREDITNOTE_200,
                                                                              "XRechnung UBL Credit Note " +
                                                                                                                VID_XRECHNUNG_UBL_CREDITNOTE_200.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_132_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -285,7 +293,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_INVOICE_200,
                                                                              "XRechnung UBL Invoice " +
                                                                                                             VID_XRECHNUNG_UBL_INVOICE_200.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_132_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -306,7 +314,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_CII_201,
                                                                              "XRechnung CII " +
                                                                                                     VID_XRECHNUNG_CII_201.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_CII_133_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -318,7 +326,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_CREDITNOTE_201,
                                                                              "XRechnung UBL Credit Note " +
                                                                                                                VID_XRECHNUNG_UBL_CREDITNOTE_201.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_133_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -330,7 +338,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_INVOICE_201,
                                                                              "XRechnung UBL Invoice " +
                                                                                                             VID_XRECHNUNG_UBL_INVOICE_201.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_133_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -353,7 +361,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_CII_211,
                                                                              "XRechnung CII " +
                                                                                                     VID_XRECHNUNG_CII_211.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_CII_136A_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -365,7 +373,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_CREDITNOTE_211,
                                                                              "XRechnung UBL Credit Note " +
                                                                                                                VID_XRECHNUNG_UBL_CREDITNOTE_211.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_136A_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -377,7 +385,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_INVOICE_211,
                                                                              "XRechnung UBL Invoice " +
                                                                                                             VID_XRECHNUNG_UBL_INVOICE_211.getVersionString (),
-                                                                             bDeprecated,
+                                                                             _createStatus (bDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_136A_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -398,7 +406,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_CII_220,
                                                                              "XRechnung CII " +
                                                                                                     VID_XRECHNUNG_CII_220.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_CII_137_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -410,7 +418,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_CREDITNOTE_220,
                                                                              "XRechnung UBL Credit Note " +
                                                                                                                VID_XRECHNUNG_UBL_CREDITNOTE_220.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_137_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -422,7 +430,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_INVOICE_220,
                                                                              "XRechnung UBL Invoice " +
                                                                                                             VID_XRECHNUNG_UBL_INVOICE_220.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_137_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -442,7 +450,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_CII_231,
                                                                              "XRechnung CII " +
                                                                                                     VID_XRECHNUNG_CII_231.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_CII_139_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -454,7 +462,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_CREDITNOTE_231,
                                                                              "XRechnung UBL Credit Note " +
                                                                                                                VID_XRECHNUNG_UBL_CREDITNOTE_231.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_139_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -466,7 +474,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_INVOICE_231,
                                                                              "XRechnung UBL Invoice " +
                                                                                                             VID_XRECHNUNG_UBL_INVOICE_231.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_139_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -486,7 +494,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_CII_301,
                                                                              "XRechnung CII " +
                                                                                                     VID_XRECHNUNG_CII_301.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (CCIID16B.getXSDResource ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_CII_1311_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -498,7 +506,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_CREDITNOTE_301,
                                                                              "XRechnung UBL Credit Note " +
                                                                                                                VID_XRECHNUNG_UBL_CREDITNOTE_301.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllCreditNoteXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_1311_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())
@@ -510,7 +518,7 @@ public static void initXRechnung (@Nonnull final IValidationExecutorSetRegistry
       aRegistry.registerValidationExecutorSet (ValidationExecutorSet.create (VID_XRECHNUNG_UBL_INVOICE_301,
                                                                              "XRechnung UBL Invoice " +
                                                                                                             VID_XRECHNUNG_UBL_INVOICE_301.getVersionString (),
-                                                                             bNotDeprecated,
+                                                                             _createStatus (bNotDeprecated),
                                                                              ValidationExecutorXSD.create (UBL21Marshaller.getAllInvoiceXSDs ()),
                                                                              ValidationExecutorSchematron.createXSLT (EN16931Validation.INVOICE_UBL_1311_XSLT,
                                                                                                                       UBL21NamespaceContext.getInstance ())