From 085335bca5437dfb5750ea95490464a98ec057c9 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Thu, 24 Aug 2023 16:42:40 +0200
Subject: [PATCH 1/8] pom: Bump version to 1.10.0-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 99c1a8b..290ab14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-sdk-analyzer</artifactId>
-  <version>1.9.0-SNAPSHOT</version>
+  <version>1.10.0-SNAPSHOT</version>
   <packaging>kjar</packaging>
 
   <name>eforms-sdk-analyzer</name>

From 052d04e2d9708f8e3983a88df0515dbf2d8f8264 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Fri, 6 Oct 2023 11:23:59 +0200
Subject: [PATCH 2/8] Load and use the new translations index file
 (TEDEFO-2706)

Instead of loading all XML files, load the translations.json, and then
load the files listed there.

Adapt test data to add translations.json everywhere it is needed.
---
 .../ted/eforms/sdk/analysis/FactsLoader.java  |  13 +-
 .../ted/eforms/sdk/analysis/SdkLoader.java    |  43 ++++---
 .../analysis/domain/{ => label}/Label.java    |   2 +-
 .../domain/label/LanguageFileInfo.java        |  25 ++++
 .../domain/label/TranslationLanguage.java     |  46 +++++++
 .../domain/label/TranslationsIndex.java       |  21 ++++
 .../eforms/sdk/analysis/fact/LabelFact.java   |   2 +-
 .../analysis/fact/TranslationsIndexFact.java  |  28 +++++
 .../sdk/analysis/validator/TextValidator.java |   2 +-
 .../invalid/translations/translations.json    | 105 ++++++++++++++++
 .../valid/translations/translations.json      | 105 ++++++++++++++++
 .../invalid/translations/translations.json    | 105 ++++++++++++++++
 .../valid/translations/translations.json      | 105 ++++++++++++++++
 .../invalid/translations/translations.json    | 105 ++++++++++++++++
 .../valid/translations/translations.json      | 105 ++++++++++++++++
 .../invalid/translations/translations.json    | 110 +++++++++++++++++
 .../valid/translations/translations.json      | 115 ++++++++++++++++++
 .../invalid/translations/translations.json    | 115 ++++++++++++++++++
 .../valid/translations/translations.json      | 115 ++++++++++++++++++
 .../invalid/translations/translations.json    | 105 ++++++++++++++++
 .../valid/translations/translations.json      | 105 ++++++++++++++++
 21 files changed, 1454 insertions(+), 23 deletions(-)
 rename src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/{ => label}/Label.java (93%)
 create mode 100644 src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/LanguageFileInfo.java
 create mode 100644 src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationLanguage.java
 create mode 100644 src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationsIndex.java
 create mode 100644 src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/TranslationsIndexFact.java
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1395/invalid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1395/valid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1795/invalid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1795/valid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1810/invalid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1810/valid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1815/invalid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1815/valid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1819/invalid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1819/valid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1871/invalid/translations/translations.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1871/valid/translations/translations.json

diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/FactsLoader.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/FactsLoader.java
index 9b2092a..9a1d1a9 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/FactsLoader.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/FactsLoader.java
@@ -11,12 +11,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
-import eu.europa.ted.eforms.sdk.analysis.domain.Label;
+
 import eu.europa.ted.eforms.sdk.analysis.domain.SvrlReport;
 import eu.europa.ted.eforms.sdk.analysis.domain.XmlNotice;
 import eu.europa.ted.eforms.sdk.analysis.domain.codelist.Codelist;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.Field;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlStructureNode;
+import eu.europa.ted.eforms.sdk.analysis.domain.label.Label;
 import eu.europa.ted.eforms.sdk.analysis.domain.noticetype.DocumentType;
 import eu.europa.ted.eforms.sdk.analysis.domain.noticetype.NoticeType;
 import eu.europa.ted.eforms.sdk.analysis.domain.view.index.TedefoViewTemplateIndex;
@@ -31,6 +32,7 @@
 import eu.europa.ted.eforms.sdk.analysis.fact.NoticeTypeFact;
 import eu.europa.ted.eforms.sdk.analysis.fact.NoticeTypesIndexFact;
 import eu.europa.ted.eforms.sdk.analysis.fact.SvrlReportFact;
+import eu.europa.ted.eforms.sdk.analysis.fact.TranslationsIndexFact;
 import eu.europa.ted.eforms.sdk.analysis.fact.ViewTemplateFact;
 import eu.europa.ted.eforms.sdk.analysis.fact.XmlNoticeFact;
 
@@ -98,6 +100,15 @@ public DataStore<NoticeTypesIndexFact> loadNoticeTypesIndex() throws IOException
     return datastore;
   }
 
+  public DataStore<TranslationsIndexFact> loadTranslationsIndex() throws IOException {
+    logger.debug("Creating facts datastore for translations index");
+
+    final DataStore<TranslationsIndexFact> datastore = DataSource.createStore();
+    datastore.add(new TranslationsIndexFact(sdkLoader.getTranslationsIndex()));
+
+    return datastore;
+  }
+
   public DataStore<LabelFact> loadLabels()
       throws IOException, JAXBException, SAXException, ParserConfigurationException {
     logger.debug("Creating facts datastore for labels");
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/SdkLoader.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/SdkLoader.java
index 5210fe7..bc5ada3 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/SdkLoader.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/SdkLoader.java
@@ -27,7 +27,6 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import eu.europa.ted.eforms.sdk.SdkConstants.SdkResource;
 import eu.europa.ted.eforms.sdk.analysis.domain.EFormsTrackableEntity;
-import eu.europa.ted.eforms.sdk.analysis.domain.Label;
 import eu.europa.ted.eforms.sdk.analysis.domain.SvrlReport;
 import eu.europa.ted.eforms.sdk.analysis.domain.XmlNotice;
 import eu.europa.ted.eforms.sdk.analysis.domain.codelist.Codelist;
@@ -36,6 +35,9 @@
 import eu.europa.ted.eforms.sdk.analysis.domain.field.Field;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.FieldsAndNodes;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlStructureNode;
+import eu.europa.ted.eforms.sdk.analysis.domain.label.Label;
+import eu.europa.ted.eforms.sdk.analysis.domain.label.LanguageFileInfo;
+import eu.europa.ted.eforms.sdk.analysis.domain.label.TranslationsIndex;
 import eu.europa.ted.eforms.sdk.analysis.domain.noticetype.NoticeSubTypeForIndex;
 import eu.europa.ted.eforms.sdk.analysis.domain.noticetype.NoticeType;
 import eu.europa.ted.eforms.sdk.analysis.domain.noticetype.NoticeTypeSdk;
@@ -57,6 +59,9 @@ public class SdkLoader {
   public static final Path EXAMPLE_NOTICES = Path.of("examples", "notices");
   public static final Path EXAMPLE_REPORTS = Path.of("examples", "reports");
 
+  // TODO: Use constant from SdkResource in ECL when it is available (TEDEFO-2707)
+  public static final Path TRANSLATIONS_JSON = Path.of("translations", "translations.json");
+
   private final Path sdkRoot;
   private final ObjectMapper objectMapper;
 
@@ -176,33 +181,33 @@ public NoticeTypeSdk getNoticeTypeSdk(String noticeId, Path sdkRoot) throws IOEx
         SdkResource.NOTICE_TYPES.getPath().toString(), MessageFormat.format("{0}.json", noticeId)));
   }
 
+  public TranslationsIndex getTranslationsIndex() throws IOException {
+    return loadJsonFile(TranslationsIndex.class,
+        Path.of(sdkRoot.toString(), TRANSLATIONS_JSON.toString()));
+  }
+
   public Set<Label> getLabels()
       throws IOException, JAXBException, SAXException, ParserConfigurationException {
     final Map<String, Label> labels = new HashMap<>();
 
     Properties translationProperties = null;
 
-    DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<Path>() {
-      public boolean accept(Path file) throws IOException {
-          return !file.getFileName().toString().matches("translations\\.(xml|json)");
-      }
-    };
-
-    try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(
-        Path.of(sdkRoot.toString(), SdkResource.TRANSLATIONS.getPath().toString()), filter)) {
+    TranslationsIndex translationsIndex = getTranslationsIndex();
 
-      for (Path path : dirStream) {
-        if (!Files.isDirectory(path)) {
-          translationProperties = XmlParser.loadXmlFile(Properties.class, path);
+    for (LanguageFileInfo info : translationsIndex.getFiles()) {
+      Path path = Path.of(sdkRoot.toString(),
+          SdkResource.TRANSLATIONS.getPath().toString(),
+          info.getFilename());
+      if (!Files.isDirectory(path)) {
+        translationProperties = XmlParser.loadXmlFile(Properties.class, path);
 
-          Language language = Language.valueOf(
-              path.getFileName().toString().replaceAll("^.*?_(.*?).xml$", "$1").toUpperCase());
+        Language language = Language.valueOf(
+            path.getFileName().toString().replaceAll("^.*?_(.*?).xml$", "$1").toUpperCase());
 
-          translationProperties.getEntry().stream().forEach(e -> {
-            Label label = labels.computeIfAbsent(e.getKey(), k -> new Label(k));
-            label.addTranslation(language, e.getValue());
-          });          
-        }
+        translationProperties.getEntry().stream().forEach(e -> {
+          Label label = labels.computeIfAbsent(e.getKey(), k -> new Label(k));
+          label.addTranslation(language, e.getValue());
+        });          
       }
     }
 
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/Label.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/Label.java
similarity index 93%
rename from src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/Label.java
rename to src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/Label.java
index 0224257..b2bc394 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/Label.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/Label.java
@@ -1,4 +1,4 @@
-package eu.europa.ted.eforms.sdk.analysis.domain;
+package eu.europa.ted.eforms.sdk.analysis.domain.label;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/LanguageFileInfo.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/LanguageFileInfo.java
new file mode 100644
index 0000000..79c4b8a
--- /dev/null
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/LanguageFileInfo.java
@@ -0,0 +1,25 @@
+package eu.europa.ted.eforms.sdk.analysis.domain.label;
+
+public class LanguageFileInfo {
+
+  private String twoLetterCode;
+  private String threeLetterCode;
+  private String assetType;
+  private String filename;
+
+  public String getTwoLetterCode() {
+    return twoLetterCode;
+  }
+
+  public String getThreeLetterCode() {
+    return threeLetterCode;
+  }
+
+  public String getAssetType() {
+    return assetType;
+  }
+
+  public String getFilename() {
+    return filename;
+  }
+}
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationLanguage.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationLanguage.java
new file mode 100644
index 0000000..99360b5
--- /dev/null
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationLanguage.java
@@ -0,0 +1,46 @@
+package eu.europa.ted.eforms.sdk.analysis.domain.label;
+
+import java.util.Objects;
+
+public class TranslationLanguage implements Comparable<TranslationLanguage> {
+  private String twoLetterCode;
+  private String threeLetterCode;
+  private String description;
+
+  public String getTwoLetterCode() {
+    return twoLetterCode;
+  }
+
+  public String getThreeLetterCode() {
+    return threeLetterCode;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  @Override
+  public int compareTo(TranslationLanguage o) {
+    return this.twoLetterCode.compareTo(o.getTwoLetterCode());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(twoLetterCode);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null) {
+      return false;
+    }
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+    TranslationLanguage other = (TranslationLanguage) obj;
+    return Objects.equals(twoLetterCode, other.twoLetterCode);
+  }
+}
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationsIndex.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationsIndex.java
new file mode 100644
index 0000000..dbcbe1a
--- /dev/null
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/label/TranslationsIndex.java
@@ -0,0 +1,21 @@
+package eu.europa.ted.eforms.sdk.analysis.domain.label;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"files", "languages"})
+public class TranslationsIndex implements Serializable {
+
+  private final List<LanguageFileInfo> files = new ArrayList<>();
+  private final List<TranslationLanguage> languages = new ArrayList<>();
+
+  public List<LanguageFileInfo> getFiles() {
+    return files;
+  }
+
+  public List<TranslationLanguage> getLanguages() {
+    return languages;
+  }
+}
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/LabelFact.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/LabelFact.java
index 26ddca3..151d7f2 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/LabelFact.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/LabelFact.java
@@ -1,6 +1,6 @@
 package eu.europa.ted.eforms.sdk.analysis.fact;
 
-import eu.europa.ted.eforms.sdk.analysis.domain.Label;
+import eu.europa.ted.eforms.sdk.analysis.domain.label.Label;
 
 public class LabelFact implements SdkComponentFact<String> {
   private static final long serialVersionUID = -8325643682910825716L;
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/TranslationsIndexFact.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/TranslationsIndexFact.java
new file mode 100644
index 0000000..947d771
--- /dev/null
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/TranslationsIndexFact.java
@@ -0,0 +1,28 @@
+package eu.europa.ted.eforms.sdk.analysis.fact;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+
+import eu.europa.ted.eforms.sdk.analysis.domain.label.LanguageFileInfo;
+import eu.europa.ted.eforms.sdk.analysis.domain.label.TranslationsIndex;
+
+public class TranslationsIndexFact implements SdkComponentFact<String>  {
+  private TranslationsIndex translationsIndex;
+
+  public TranslationsIndexFact(TranslationsIndex translationsIndex) {
+    this.translationsIndex = translationsIndex;
+  }
+
+  public List<String> getTranslationFilenames() {
+    return translationsIndex.getFiles().stream()
+        .map(LanguageFileInfo::getFilename).collect(Collectors.toList());
+  }
+  
+  @Override
+  public String getId() {
+    return StringUtils.EMPTY;
+  }
+    
+}
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/TextValidator.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/TextValidator.java
index 1e577b4..3faab68 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/TextValidator.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/TextValidator.java
@@ -11,7 +11,7 @@
 import org.slf4j.LoggerFactory;
 
 import eu.europa.ted.eforms.sdk.analysis.SdkLoader;
-import eu.europa.ted.eforms.sdk.analysis.domain.Label;
+import eu.europa.ted.eforms.sdk.analysis.domain.label.Label;
 import eu.europa.ted.eforms.sdk.analysis.enums.ValidationStatusEnum;
 import eu.europa.ted.eforms.sdk.analysis.fact.LabelFact;
 import eu.europa.ted.eforms.sdk.analysis.vo.ValidationResult;
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1395/invalid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1395/invalid/translations/translations.json
new file mode 100644
index 0000000..7092009
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1395/invalid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+    "files" : [ {
+      "assetType" : "code",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng",
+      "filename" : "code_en.xml"
+    } ],
+    "languages" : [ {
+      "description" : "Bulgarian",
+      "twoLetterCode" : "bg",
+      "threeLetterCode" : "bul"
+    }, {
+      "description" : "Czech",
+      "twoLetterCode" : "cs",
+      "threeLetterCode" : "ces"
+    }, {
+      "description" : "Danish",
+      "twoLetterCode" : "da",
+      "threeLetterCode" : "dan"
+    }, {
+      "description" : "German",
+      "twoLetterCode" : "de",
+      "threeLetterCode" : "deu"
+    }, {
+      "description" : "Greek",
+      "twoLetterCode" : "el",
+      "threeLetterCode" : "ell"
+    }, {
+      "description" : "English",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng"
+    }, {
+      "description" : "Spanish",
+      "twoLetterCode" : "es",
+      "threeLetterCode" : "spa"
+    }, {
+      "description" : "Estonian",
+      "twoLetterCode" : "et",
+      "threeLetterCode" : "est"
+    }, {
+      "description" : "Finnish",
+      "twoLetterCode" : "fi",
+      "threeLetterCode" : "fin"
+    }, {
+      "description" : "French",
+      "twoLetterCode" : "fr",
+      "threeLetterCode" : "fra"
+    }, {
+      "description" : "Irish",
+      "twoLetterCode" : "ga",
+      "threeLetterCode" : "gle"
+    }, {
+      "description" : "Croatian",
+      "twoLetterCode" : "hr",
+      "threeLetterCode" : "hrv"
+    }, {
+      "description" : "Hungarian",
+      "twoLetterCode" : "hu",
+      "threeLetterCode" : "hun"
+    }, {
+      "description" : "Italian",
+      "twoLetterCode" : "it",
+      "threeLetterCode" : "ita"
+    }, {
+      "description" : "Lithuanian",
+      "twoLetterCode" : "lt",
+      "threeLetterCode" : "lit"
+    }, {
+      "description" : "Latvian",
+      "twoLetterCode" : "lv",
+      "threeLetterCode" : "lav"
+    }, {
+      "description" : "Maltese",
+      "twoLetterCode" : "mt",
+      "threeLetterCode" : "mlt"
+    }, {
+      "description" : "Dutch",
+      "twoLetterCode" : "nl",
+      "threeLetterCode" : "nld"
+    }, {
+      "description" : "Polish",
+      "twoLetterCode" : "pl",
+      "threeLetterCode" : "pol"
+    }, {
+      "description" : "Portuguese",
+      "twoLetterCode" : "pt",
+      "threeLetterCode" : "por"
+    }, {
+      "description" : "Romanian",
+      "twoLetterCode" : "ro",
+      "threeLetterCode" : "ron"
+    }, {
+      "description" : "Slovak",
+      "twoLetterCode" : "sk",
+      "threeLetterCode" : "slk"
+    }, {
+      "description" : "Slovenian",
+      "twoLetterCode" : "sl",
+      "threeLetterCode" : "slv"
+    }, {
+      "description" : "Swedish",
+      "twoLetterCode" : "sv",
+      "threeLetterCode" : "swe"
+    } ]
+  }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1395/valid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1395/valid/translations/translations.json
new file mode 100644
index 0000000..7092009
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1395/valid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+    "files" : [ {
+      "assetType" : "code",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng",
+      "filename" : "code_en.xml"
+    } ],
+    "languages" : [ {
+      "description" : "Bulgarian",
+      "twoLetterCode" : "bg",
+      "threeLetterCode" : "bul"
+    }, {
+      "description" : "Czech",
+      "twoLetterCode" : "cs",
+      "threeLetterCode" : "ces"
+    }, {
+      "description" : "Danish",
+      "twoLetterCode" : "da",
+      "threeLetterCode" : "dan"
+    }, {
+      "description" : "German",
+      "twoLetterCode" : "de",
+      "threeLetterCode" : "deu"
+    }, {
+      "description" : "Greek",
+      "twoLetterCode" : "el",
+      "threeLetterCode" : "ell"
+    }, {
+      "description" : "English",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng"
+    }, {
+      "description" : "Spanish",
+      "twoLetterCode" : "es",
+      "threeLetterCode" : "spa"
+    }, {
+      "description" : "Estonian",
+      "twoLetterCode" : "et",
+      "threeLetterCode" : "est"
+    }, {
+      "description" : "Finnish",
+      "twoLetterCode" : "fi",
+      "threeLetterCode" : "fin"
+    }, {
+      "description" : "French",
+      "twoLetterCode" : "fr",
+      "threeLetterCode" : "fra"
+    }, {
+      "description" : "Irish",
+      "twoLetterCode" : "ga",
+      "threeLetterCode" : "gle"
+    }, {
+      "description" : "Croatian",
+      "twoLetterCode" : "hr",
+      "threeLetterCode" : "hrv"
+    }, {
+      "description" : "Hungarian",
+      "twoLetterCode" : "hu",
+      "threeLetterCode" : "hun"
+    }, {
+      "description" : "Italian",
+      "twoLetterCode" : "it",
+      "threeLetterCode" : "ita"
+    }, {
+      "description" : "Lithuanian",
+      "twoLetterCode" : "lt",
+      "threeLetterCode" : "lit"
+    }, {
+      "description" : "Latvian",
+      "twoLetterCode" : "lv",
+      "threeLetterCode" : "lav"
+    }, {
+      "description" : "Maltese",
+      "twoLetterCode" : "mt",
+      "threeLetterCode" : "mlt"
+    }, {
+      "description" : "Dutch",
+      "twoLetterCode" : "nl",
+      "threeLetterCode" : "nld"
+    }, {
+      "description" : "Polish",
+      "twoLetterCode" : "pl",
+      "threeLetterCode" : "pol"
+    }, {
+      "description" : "Portuguese",
+      "twoLetterCode" : "pt",
+      "threeLetterCode" : "por"
+    }, {
+      "description" : "Romanian",
+      "twoLetterCode" : "ro",
+      "threeLetterCode" : "ron"
+    }, {
+      "description" : "Slovak",
+      "twoLetterCode" : "sk",
+      "threeLetterCode" : "slk"
+    }, {
+      "description" : "Slovenian",
+      "twoLetterCode" : "sl",
+      "threeLetterCode" : "slv"
+    }, {
+      "description" : "Swedish",
+      "twoLetterCode" : "sv",
+      "threeLetterCode" : "swe"
+    } ]
+  }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1795/invalid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1795/invalid/translations/translations.json
new file mode 100644
index 0000000..463f31a
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1795/invalid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+    "files" : [ {
+      "assetType" : "codelist",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng",
+      "filename" : "codelist_en.xml"
+    } ],
+    "languages" : [ {
+      "description" : "Bulgarian",
+      "twoLetterCode" : "bg",
+      "threeLetterCode" : "bul"
+    }, {
+      "description" : "Czech",
+      "twoLetterCode" : "cs",
+      "threeLetterCode" : "ces"
+    }, {
+      "description" : "Danish",
+      "twoLetterCode" : "da",
+      "threeLetterCode" : "dan"
+    }, {
+      "description" : "German",
+      "twoLetterCode" : "de",
+      "threeLetterCode" : "deu"
+    }, {
+      "description" : "Greek",
+      "twoLetterCode" : "el",
+      "threeLetterCode" : "ell"
+    }, {
+      "description" : "English",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng"
+    }, {
+      "description" : "Spanish",
+      "twoLetterCode" : "es",
+      "threeLetterCode" : "spa"
+    }, {
+      "description" : "Estonian",
+      "twoLetterCode" : "et",
+      "threeLetterCode" : "est"
+    }, {
+      "description" : "Finnish",
+      "twoLetterCode" : "fi",
+      "threeLetterCode" : "fin"
+    }, {
+      "description" : "French",
+      "twoLetterCode" : "fr",
+      "threeLetterCode" : "fra"
+    }, {
+      "description" : "Irish",
+      "twoLetterCode" : "ga",
+      "threeLetterCode" : "gle"
+    }, {
+      "description" : "Croatian",
+      "twoLetterCode" : "hr",
+      "threeLetterCode" : "hrv"
+    }, {
+      "description" : "Hungarian",
+      "twoLetterCode" : "hu",
+      "threeLetterCode" : "hun"
+    }, {
+      "description" : "Italian",
+      "twoLetterCode" : "it",
+      "threeLetterCode" : "ita"
+    }, {
+      "description" : "Lithuanian",
+      "twoLetterCode" : "lt",
+      "threeLetterCode" : "lit"
+    }, {
+      "description" : "Latvian",
+      "twoLetterCode" : "lv",
+      "threeLetterCode" : "lav"
+    }, {
+      "description" : "Maltese",
+      "twoLetterCode" : "mt",
+      "threeLetterCode" : "mlt"
+    }, {
+      "description" : "Dutch",
+      "twoLetterCode" : "nl",
+      "threeLetterCode" : "nld"
+    }, {
+      "description" : "Polish",
+      "twoLetterCode" : "pl",
+      "threeLetterCode" : "pol"
+    }, {
+      "description" : "Portuguese",
+      "twoLetterCode" : "pt",
+      "threeLetterCode" : "por"
+    }, {
+      "description" : "Romanian",
+      "twoLetterCode" : "ro",
+      "threeLetterCode" : "ron"
+    }, {
+      "description" : "Slovak",
+      "twoLetterCode" : "sk",
+      "threeLetterCode" : "slk"
+    }, {
+      "description" : "Slovenian",
+      "twoLetterCode" : "sl",
+      "threeLetterCode" : "slv"
+    }, {
+      "description" : "Swedish",
+      "twoLetterCode" : "sv",
+      "threeLetterCode" : "swe"
+    } ]
+  }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1795/valid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1795/valid/translations/translations.json
new file mode 100644
index 0000000..463f31a
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1795/valid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+    "files" : [ {
+      "assetType" : "codelist",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng",
+      "filename" : "codelist_en.xml"
+    } ],
+    "languages" : [ {
+      "description" : "Bulgarian",
+      "twoLetterCode" : "bg",
+      "threeLetterCode" : "bul"
+    }, {
+      "description" : "Czech",
+      "twoLetterCode" : "cs",
+      "threeLetterCode" : "ces"
+    }, {
+      "description" : "Danish",
+      "twoLetterCode" : "da",
+      "threeLetterCode" : "dan"
+    }, {
+      "description" : "German",
+      "twoLetterCode" : "de",
+      "threeLetterCode" : "deu"
+    }, {
+      "description" : "Greek",
+      "twoLetterCode" : "el",
+      "threeLetterCode" : "ell"
+    }, {
+      "description" : "English",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng"
+    }, {
+      "description" : "Spanish",
+      "twoLetterCode" : "es",
+      "threeLetterCode" : "spa"
+    }, {
+      "description" : "Estonian",
+      "twoLetterCode" : "et",
+      "threeLetterCode" : "est"
+    }, {
+      "description" : "Finnish",
+      "twoLetterCode" : "fi",
+      "threeLetterCode" : "fin"
+    }, {
+      "description" : "French",
+      "twoLetterCode" : "fr",
+      "threeLetterCode" : "fra"
+    }, {
+      "description" : "Irish",
+      "twoLetterCode" : "ga",
+      "threeLetterCode" : "gle"
+    }, {
+      "description" : "Croatian",
+      "twoLetterCode" : "hr",
+      "threeLetterCode" : "hrv"
+    }, {
+      "description" : "Hungarian",
+      "twoLetterCode" : "hu",
+      "threeLetterCode" : "hun"
+    }, {
+      "description" : "Italian",
+      "twoLetterCode" : "it",
+      "threeLetterCode" : "ita"
+    }, {
+      "description" : "Lithuanian",
+      "twoLetterCode" : "lt",
+      "threeLetterCode" : "lit"
+    }, {
+      "description" : "Latvian",
+      "twoLetterCode" : "lv",
+      "threeLetterCode" : "lav"
+    }, {
+      "description" : "Maltese",
+      "twoLetterCode" : "mt",
+      "threeLetterCode" : "mlt"
+    }, {
+      "description" : "Dutch",
+      "twoLetterCode" : "nl",
+      "threeLetterCode" : "nld"
+    }, {
+      "description" : "Polish",
+      "twoLetterCode" : "pl",
+      "threeLetterCode" : "pol"
+    }, {
+      "description" : "Portuguese",
+      "twoLetterCode" : "pt",
+      "threeLetterCode" : "por"
+    }, {
+      "description" : "Romanian",
+      "twoLetterCode" : "ro",
+      "threeLetterCode" : "ron"
+    }, {
+      "description" : "Slovak",
+      "twoLetterCode" : "sk",
+      "threeLetterCode" : "slk"
+    }, {
+      "description" : "Slovenian",
+      "twoLetterCode" : "sl",
+      "threeLetterCode" : "slv"
+    }, {
+      "description" : "Swedish",
+      "twoLetterCode" : "sv",
+      "threeLetterCode" : "swe"
+    } ]
+  }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1810/invalid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1810/invalid/translations/translations.json
new file mode 100644
index 0000000..01d0873
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1810/invalid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+  "files" : [ {
+    "assetType" : "rule",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "bul",
+    "filename" : "rule_en.xml"
+  } ],
+  "languages" : [ {
+    "description" : "Bulgarian",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul"
+  }, {
+    "description" : "Czech",
+    "twoLetterCode" : "cs",
+    "threeLetterCode" : "ces"
+  }, {
+    "description" : "Danish",
+    "twoLetterCode" : "da",
+    "threeLetterCode" : "dan"
+  }, {
+    "description" : "German",
+    "twoLetterCode" : "de",
+    "threeLetterCode" : "deu"
+  }, {
+    "description" : "Greek",
+    "twoLetterCode" : "el",
+    "threeLetterCode" : "ell"
+  }, {
+    "description" : "English",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "eng"
+  }, {
+    "description" : "Spanish",
+    "twoLetterCode" : "es",
+    "threeLetterCode" : "spa"
+  }, {
+    "description" : "Estonian",
+    "twoLetterCode" : "et",
+    "threeLetterCode" : "est"
+  }, {
+    "description" : "Finnish",
+    "twoLetterCode" : "fi",
+    "threeLetterCode" : "fin"
+  }, {
+    "description" : "French",
+    "twoLetterCode" : "fr",
+    "threeLetterCode" : "fra"
+  }, {
+    "description" : "Irish",
+    "twoLetterCode" : "ga",
+    "threeLetterCode" : "gle"
+  }, {
+    "description" : "Croatian",
+    "twoLetterCode" : "hr",
+    "threeLetterCode" : "hrv"
+  }, {
+    "description" : "Hungarian",
+    "twoLetterCode" : "hu",
+    "threeLetterCode" : "hun"
+  }, {
+    "description" : "Italian",
+    "twoLetterCode" : "it",
+    "threeLetterCode" : "ita"
+  }, {
+    "description" : "Lithuanian",
+    "twoLetterCode" : "lt",
+    "threeLetterCode" : "lit"
+  }, {
+    "description" : "Latvian",
+    "twoLetterCode" : "lv",
+    "threeLetterCode" : "lav"
+  }, {
+    "description" : "Maltese",
+    "twoLetterCode" : "mt",
+    "threeLetterCode" : "mlt"
+  }, {
+    "description" : "Dutch",
+    "twoLetterCode" : "nl",
+    "threeLetterCode" : "nld"
+  }, {
+    "description" : "Polish",
+    "twoLetterCode" : "pl",
+    "threeLetterCode" : "pol"
+  }, {
+    "description" : "Portuguese",
+    "twoLetterCode" : "pt",
+    "threeLetterCode" : "por"
+  }, {
+    "description" : "Romanian",
+    "twoLetterCode" : "ro",
+    "threeLetterCode" : "ron"
+  }, {
+    "description" : "Slovak",
+    "twoLetterCode" : "sk",
+    "threeLetterCode" : "slk"
+  }, {
+    "description" : "Slovenian",
+    "twoLetterCode" : "sl",
+    "threeLetterCode" : "slv"
+  }, {
+    "description" : "Swedish",
+    "twoLetterCode" : "sv",
+    "threeLetterCode" : "swe"
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1810/valid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1810/valid/translations/translations.json
new file mode 100644
index 0000000..01d0873
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1810/valid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+  "files" : [ {
+    "assetType" : "rule",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "bul",
+    "filename" : "rule_en.xml"
+  } ],
+  "languages" : [ {
+    "description" : "Bulgarian",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul"
+  }, {
+    "description" : "Czech",
+    "twoLetterCode" : "cs",
+    "threeLetterCode" : "ces"
+  }, {
+    "description" : "Danish",
+    "twoLetterCode" : "da",
+    "threeLetterCode" : "dan"
+  }, {
+    "description" : "German",
+    "twoLetterCode" : "de",
+    "threeLetterCode" : "deu"
+  }, {
+    "description" : "Greek",
+    "twoLetterCode" : "el",
+    "threeLetterCode" : "ell"
+  }, {
+    "description" : "English",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "eng"
+  }, {
+    "description" : "Spanish",
+    "twoLetterCode" : "es",
+    "threeLetterCode" : "spa"
+  }, {
+    "description" : "Estonian",
+    "twoLetterCode" : "et",
+    "threeLetterCode" : "est"
+  }, {
+    "description" : "Finnish",
+    "twoLetterCode" : "fi",
+    "threeLetterCode" : "fin"
+  }, {
+    "description" : "French",
+    "twoLetterCode" : "fr",
+    "threeLetterCode" : "fra"
+  }, {
+    "description" : "Irish",
+    "twoLetterCode" : "ga",
+    "threeLetterCode" : "gle"
+  }, {
+    "description" : "Croatian",
+    "twoLetterCode" : "hr",
+    "threeLetterCode" : "hrv"
+  }, {
+    "description" : "Hungarian",
+    "twoLetterCode" : "hu",
+    "threeLetterCode" : "hun"
+  }, {
+    "description" : "Italian",
+    "twoLetterCode" : "it",
+    "threeLetterCode" : "ita"
+  }, {
+    "description" : "Lithuanian",
+    "twoLetterCode" : "lt",
+    "threeLetterCode" : "lit"
+  }, {
+    "description" : "Latvian",
+    "twoLetterCode" : "lv",
+    "threeLetterCode" : "lav"
+  }, {
+    "description" : "Maltese",
+    "twoLetterCode" : "mt",
+    "threeLetterCode" : "mlt"
+  }, {
+    "description" : "Dutch",
+    "twoLetterCode" : "nl",
+    "threeLetterCode" : "nld"
+  }, {
+    "description" : "Polish",
+    "twoLetterCode" : "pl",
+    "threeLetterCode" : "pol"
+  }, {
+    "description" : "Portuguese",
+    "twoLetterCode" : "pt",
+    "threeLetterCode" : "por"
+  }, {
+    "description" : "Romanian",
+    "twoLetterCode" : "ro",
+    "threeLetterCode" : "ron"
+  }, {
+    "description" : "Slovak",
+    "twoLetterCode" : "sk",
+    "threeLetterCode" : "slk"
+  }, {
+    "description" : "Slovenian",
+    "twoLetterCode" : "sl",
+    "threeLetterCode" : "slv"
+  }, {
+    "description" : "Swedish",
+    "twoLetterCode" : "sv",
+    "threeLetterCode" : "swe"
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1815/invalid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1815/invalid/translations/translations.json
new file mode 100644
index 0000000..99e5854
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1815/invalid/translations/translations.json
@@ -0,0 +1,110 @@
+{
+    "files" : [ {
+      "assetType" : "business-term",
+      "twoLetterCode" : "bg",
+      "threeLetterCode" : "bul",
+      "filename" : "business-term_bg.xml"
+    }, {
+      "assetType" : "auxiliary",
+      "twoLetterCode" : "bg",
+      "threeLetterCode" : "bul",
+      "filename" : "auxiliary_bg.xml"
+    } ],
+    "languages" : [ {
+      "description" : "Bulgarian",
+      "twoLetterCode" : "bg",
+      "threeLetterCode" : "bul"
+    }, {
+      "description" : "Czech",
+      "twoLetterCode" : "cs",
+      "threeLetterCode" : "ces"
+    }, {
+      "description" : "Danish",
+      "twoLetterCode" : "da",
+      "threeLetterCode" : "dan"
+    }, {
+      "description" : "German",
+      "twoLetterCode" : "de",
+      "threeLetterCode" : "deu"
+    }, {
+      "description" : "Greek",
+      "twoLetterCode" : "el",
+      "threeLetterCode" : "ell"
+    }, {
+      "description" : "English",
+      "twoLetterCode" : "en",
+      "threeLetterCode" : "eng"
+    }, {
+      "description" : "Spanish",
+      "twoLetterCode" : "es",
+      "threeLetterCode" : "spa"
+    }, {
+      "description" : "Estonian",
+      "twoLetterCode" : "et",
+      "threeLetterCode" : "est"
+    }, {
+      "description" : "Finnish",
+      "twoLetterCode" : "fi",
+      "threeLetterCode" : "fin"
+    }, {
+      "description" : "French",
+      "twoLetterCode" : "fr",
+      "threeLetterCode" : "fra"
+    }, {
+      "description" : "Irish",
+      "twoLetterCode" : "ga",
+      "threeLetterCode" : "gle"
+    }, {
+      "description" : "Croatian",
+      "twoLetterCode" : "hr",
+      "threeLetterCode" : "hrv"
+    }, {
+      "description" : "Hungarian",
+      "twoLetterCode" : "hu",
+      "threeLetterCode" : "hun"
+    }, {
+      "description" : "Italian",
+      "twoLetterCode" : "it",
+      "threeLetterCode" : "ita"
+    }, {
+      "description" : "Lithuanian",
+      "twoLetterCode" : "lt",
+      "threeLetterCode" : "lit"
+    }, {
+      "description" : "Latvian",
+      "twoLetterCode" : "lv",
+      "threeLetterCode" : "lav"
+    }, {
+      "description" : "Maltese",
+      "twoLetterCode" : "mt",
+      "threeLetterCode" : "mlt"
+    }, {
+      "description" : "Dutch",
+      "twoLetterCode" : "nl",
+      "threeLetterCode" : "nld"
+    }, {
+      "description" : "Polish",
+      "twoLetterCode" : "pl",
+      "threeLetterCode" : "pol"
+    }, {
+      "description" : "Portuguese",
+      "twoLetterCode" : "pt",
+      "threeLetterCode" : "por"
+    }, {
+      "description" : "Romanian",
+      "twoLetterCode" : "ro",
+      "threeLetterCode" : "ron"
+    }, {
+      "description" : "Slovak",
+      "twoLetterCode" : "sk",
+      "threeLetterCode" : "slk"
+    }, {
+      "description" : "Slovenian",
+      "twoLetterCode" : "sl",
+      "threeLetterCode" : "slv"
+    }, {
+      "description" : "Swedish",
+      "twoLetterCode" : "sv",
+      "threeLetterCode" : "swe"
+    } ]
+  }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1815/valid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1815/valid/translations/translations.json
new file mode 100644
index 0000000..868c5a3
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1815/valid/translations/translations.json
@@ -0,0 +1,115 @@
+{
+  "files" : [ {
+    "assetType" : "business-term",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "business-term_bg.xml"
+  }, {
+    "assetType" : "code",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "code_bg.xml"
+  }, {
+    "assetType" : "auxiliary",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "auxiliary_bg.xml"
+  } ],
+  "languages" : [ {
+    "description" : "Bulgarian",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul"
+  }, {
+    "description" : "Czech",
+    "twoLetterCode" : "cs",
+    "threeLetterCode" : "ces"
+  }, {
+    "description" : "Danish",
+    "twoLetterCode" : "da",
+    "threeLetterCode" : "dan"
+  }, {
+    "description" : "German",
+    "twoLetterCode" : "de",
+    "threeLetterCode" : "deu"
+  }, {
+    "description" : "Greek",
+    "twoLetterCode" : "el",
+    "threeLetterCode" : "ell"
+  }, {
+    "description" : "English",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "eng"
+  }, {
+    "description" : "Spanish",
+    "twoLetterCode" : "es",
+    "threeLetterCode" : "spa"
+  }, {
+    "description" : "Estonian",
+    "twoLetterCode" : "et",
+    "threeLetterCode" : "est"
+  }, {
+    "description" : "Finnish",
+    "twoLetterCode" : "fi",
+    "threeLetterCode" : "fin"
+  }, {
+    "description" : "French",
+    "twoLetterCode" : "fr",
+    "threeLetterCode" : "fra"
+  }, {
+    "description" : "Irish",
+    "twoLetterCode" : "ga",
+    "threeLetterCode" : "gle"
+  }, {
+    "description" : "Croatian",
+    "twoLetterCode" : "hr",
+    "threeLetterCode" : "hrv"
+  }, {
+    "description" : "Hungarian",
+    "twoLetterCode" : "hu",
+    "threeLetterCode" : "hun"
+  }, {
+    "description" : "Italian",
+    "twoLetterCode" : "it",
+    "threeLetterCode" : "ita"
+  }, {
+    "description" : "Lithuanian",
+    "twoLetterCode" : "lt",
+    "threeLetterCode" : "lit"
+  }, {
+    "description" : "Latvian",
+    "twoLetterCode" : "lv",
+    "threeLetterCode" : "lav"
+  }, {
+    "description" : "Maltese",
+    "twoLetterCode" : "mt",
+    "threeLetterCode" : "mlt"
+  }, {
+    "description" : "Dutch",
+    "twoLetterCode" : "nl",
+    "threeLetterCode" : "nld"
+  }, {
+    "description" : "Polish",
+    "twoLetterCode" : "pl",
+    "threeLetterCode" : "pol"
+  }, {
+    "description" : "Portuguese",
+    "twoLetterCode" : "pt",
+    "threeLetterCode" : "por"
+  }, {
+    "description" : "Romanian",
+    "twoLetterCode" : "ro",
+    "threeLetterCode" : "ron"
+  }, {
+    "description" : "Slovak",
+    "twoLetterCode" : "sk",
+    "threeLetterCode" : "slk"
+  }, {
+    "description" : "Slovenian",
+    "twoLetterCode" : "sl",
+    "threeLetterCode" : "slv"
+  }, {
+    "description" : "Swedish",
+    "twoLetterCode" : "sv",
+    "threeLetterCode" : "swe"
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1819/invalid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1819/invalid/translations/translations.json
new file mode 100644
index 0000000..4843c84
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1819/invalid/translations/translations.json
@@ -0,0 +1,115 @@
+{
+  "files" : [ {
+    "assetType" : "field",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "field_bg.xml"
+  }, {
+    "assetType" : "group",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "group_bg.xml"
+  }, {
+    "assetType" : "notice",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "notice_bg.xml"
+  } ],
+  "languages" : [ {
+    "description" : "Bulgarian",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul"
+  }, {
+    "description" : "Czech",
+    "twoLetterCode" : "cs",
+    "threeLetterCode" : "ces"
+  }, {
+    "description" : "Danish",
+    "twoLetterCode" : "da",
+    "threeLetterCode" : "dan"
+  }, {
+    "description" : "German",
+    "twoLetterCode" : "de",
+    "threeLetterCode" : "deu"
+  }, {
+    "description" : "Greek",
+    "twoLetterCode" : "el",
+    "threeLetterCode" : "ell"
+  }, {
+    "description" : "English",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "eng"
+  }, {
+    "description" : "Spanish",
+    "twoLetterCode" : "es",
+    "threeLetterCode" : "spa"
+  }, {
+    "description" : "Estonian",
+    "twoLetterCode" : "et",
+    "threeLetterCode" : "est"
+  }, {
+    "description" : "Finnish",
+    "twoLetterCode" : "fi",
+    "threeLetterCode" : "fin"
+  }, {
+    "description" : "French",
+    "twoLetterCode" : "fr",
+    "threeLetterCode" : "fra"
+  }, {
+    "description" : "Irish",
+    "twoLetterCode" : "ga",
+    "threeLetterCode" : "gle"
+  }, {
+    "description" : "Croatian",
+    "twoLetterCode" : "hr",
+    "threeLetterCode" : "hrv"
+  }, {
+    "description" : "Hungarian",
+    "twoLetterCode" : "hu",
+    "threeLetterCode" : "hun"
+  }, {
+    "description" : "Italian",
+    "twoLetterCode" : "it",
+    "threeLetterCode" : "ita"
+  }, {
+    "description" : "Lithuanian",
+    "twoLetterCode" : "lt",
+    "threeLetterCode" : "lit"
+  }, {
+    "description" : "Latvian",
+    "twoLetterCode" : "lv",
+    "threeLetterCode" : "lav"
+  }, {
+    "description" : "Maltese",
+    "twoLetterCode" : "mt",
+    "threeLetterCode" : "mlt"
+  }, {
+    "description" : "Dutch",
+    "twoLetterCode" : "nl",
+    "threeLetterCode" : "nld"
+  }, {
+    "description" : "Polish",
+    "twoLetterCode" : "pl",
+    "threeLetterCode" : "pol"
+  }, {
+    "description" : "Portuguese",
+    "twoLetterCode" : "pt",
+    "threeLetterCode" : "por"
+  }, {
+    "description" : "Romanian",
+    "twoLetterCode" : "ro",
+    "threeLetterCode" : "ron"
+  }, {
+    "description" : "Slovak",
+    "twoLetterCode" : "sk",
+    "threeLetterCode" : "slk"
+  }, {
+    "description" : "Slovenian",
+    "twoLetterCode" : "sl",
+    "threeLetterCode" : "slv"
+  }, {
+    "description" : "Swedish",
+    "twoLetterCode" : "sv",
+    "threeLetterCode" : "swe"
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1819/valid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1819/valid/translations/translations.json
new file mode 100644
index 0000000..4843c84
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1819/valid/translations/translations.json
@@ -0,0 +1,115 @@
+{
+  "files" : [ {
+    "assetType" : "field",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "field_bg.xml"
+  }, {
+    "assetType" : "group",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "group_bg.xml"
+  }, {
+    "assetType" : "notice",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul",
+    "filename" : "notice_bg.xml"
+  } ],
+  "languages" : [ {
+    "description" : "Bulgarian",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul"
+  }, {
+    "description" : "Czech",
+    "twoLetterCode" : "cs",
+    "threeLetterCode" : "ces"
+  }, {
+    "description" : "Danish",
+    "twoLetterCode" : "da",
+    "threeLetterCode" : "dan"
+  }, {
+    "description" : "German",
+    "twoLetterCode" : "de",
+    "threeLetterCode" : "deu"
+  }, {
+    "description" : "Greek",
+    "twoLetterCode" : "el",
+    "threeLetterCode" : "ell"
+  }, {
+    "description" : "English",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "eng"
+  }, {
+    "description" : "Spanish",
+    "twoLetterCode" : "es",
+    "threeLetterCode" : "spa"
+  }, {
+    "description" : "Estonian",
+    "twoLetterCode" : "et",
+    "threeLetterCode" : "est"
+  }, {
+    "description" : "Finnish",
+    "twoLetterCode" : "fi",
+    "threeLetterCode" : "fin"
+  }, {
+    "description" : "French",
+    "twoLetterCode" : "fr",
+    "threeLetterCode" : "fra"
+  }, {
+    "description" : "Irish",
+    "twoLetterCode" : "ga",
+    "threeLetterCode" : "gle"
+  }, {
+    "description" : "Croatian",
+    "twoLetterCode" : "hr",
+    "threeLetterCode" : "hrv"
+  }, {
+    "description" : "Hungarian",
+    "twoLetterCode" : "hu",
+    "threeLetterCode" : "hun"
+  }, {
+    "description" : "Italian",
+    "twoLetterCode" : "it",
+    "threeLetterCode" : "ita"
+  }, {
+    "description" : "Lithuanian",
+    "twoLetterCode" : "lt",
+    "threeLetterCode" : "lit"
+  }, {
+    "description" : "Latvian",
+    "twoLetterCode" : "lv",
+    "threeLetterCode" : "lav"
+  }, {
+    "description" : "Maltese",
+    "twoLetterCode" : "mt",
+    "threeLetterCode" : "mlt"
+  }, {
+    "description" : "Dutch",
+    "twoLetterCode" : "nl",
+    "threeLetterCode" : "nld"
+  }, {
+    "description" : "Polish",
+    "twoLetterCode" : "pl",
+    "threeLetterCode" : "pol"
+  }, {
+    "description" : "Portuguese",
+    "twoLetterCode" : "pt",
+    "threeLetterCode" : "por"
+  }, {
+    "description" : "Romanian",
+    "twoLetterCode" : "ro",
+    "threeLetterCode" : "ron"
+  }, {
+    "description" : "Slovak",
+    "twoLetterCode" : "sk",
+    "threeLetterCode" : "slk"
+  }, {
+    "description" : "Slovenian",
+    "twoLetterCode" : "sl",
+    "threeLetterCode" : "slv"
+  }, {
+    "description" : "Swedish",
+    "twoLetterCode" : "sv",
+    "threeLetterCode" : "swe"
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1871/invalid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1871/invalid/translations/translations.json
new file mode 100644
index 0000000..b228558
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1871/invalid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+  "files" : [ {
+    "assetType" : "code",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "bul",
+    "filename" : "code_en.xml"
+  } ],
+  "languages" : [ {
+    "description" : "Bulgarian",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul"
+  }, {
+    "description" : "Czech",
+    "twoLetterCode" : "cs",
+    "threeLetterCode" : "ces"
+  }, {
+    "description" : "Danish",
+    "twoLetterCode" : "da",
+    "threeLetterCode" : "dan"
+  }, {
+    "description" : "German",
+    "twoLetterCode" : "de",
+    "threeLetterCode" : "deu"
+  }, {
+    "description" : "Greek",
+    "twoLetterCode" : "el",
+    "threeLetterCode" : "ell"
+  }, {
+    "description" : "English",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "eng"
+  }, {
+    "description" : "Spanish",
+    "twoLetterCode" : "es",
+    "threeLetterCode" : "spa"
+  }, {
+    "description" : "Estonian",
+    "twoLetterCode" : "et",
+    "threeLetterCode" : "est"
+  }, {
+    "description" : "Finnish",
+    "twoLetterCode" : "fi",
+    "threeLetterCode" : "fin"
+  }, {
+    "description" : "French",
+    "twoLetterCode" : "fr",
+    "threeLetterCode" : "fra"
+  }, {
+    "description" : "Irish",
+    "twoLetterCode" : "ga",
+    "threeLetterCode" : "gle"
+  }, {
+    "description" : "Croatian",
+    "twoLetterCode" : "hr",
+    "threeLetterCode" : "hrv"
+  }, {
+    "description" : "Hungarian",
+    "twoLetterCode" : "hu",
+    "threeLetterCode" : "hun"
+  }, {
+    "description" : "Italian",
+    "twoLetterCode" : "it",
+    "threeLetterCode" : "ita"
+  }, {
+    "description" : "Lithuanian",
+    "twoLetterCode" : "lt",
+    "threeLetterCode" : "lit"
+  }, {
+    "description" : "Latvian",
+    "twoLetterCode" : "lv",
+    "threeLetterCode" : "lav"
+  }, {
+    "description" : "Maltese",
+    "twoLetterCode" : "mt",
+    "threeLetterCode" : "mlt"
+  }, {
+    "description" : "Dutch",
+    "twoLetterCode" : "nl",
+    "threeLetterCode" : "nld"
+  }, {
+    "description" : "Polish",
+    "twoLetterCode" : "pl",
+    "threeLetterCode" : "pol"
+  }, {
+    "description" : "Portuguese",
+    "twoLetterCode" : "pt",
+    "threeLetterCode" : "por"
+  }, {
+    "description" : "Romanian",
+    "twoLetterCode" : "ro",
+    "threeLetterCode" : "ron"
+  }, {
+    "description" : "Slovak",
+    "twoLetterCode" : "sk",
+    "threeLetterCode" : "slk"
+  }, {
+    "description" : "Slovenian",
+    "twoLetterCode" : "sl",
+    "threeLetterCode" : "slv"
+  }, {
+    "description" : "Swedish",
+    "twoLetterCode" : "sv",
+    "threeLetterCode" : "swe"
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1871/valid/translations/translations.json b/src/test/resources/eforms-sdk-tests/tedefo-1871/valid/translations/translations.json
new file mode 100644
index 0000000..b228558
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1871/valid/translations/translations.json
@@ -0,0 +1,105 @@
+{
+  "files" : [ {
+    "assetType" : "code",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "bul",
+    "filename" : "code_en.xml"
+  } ],
+  "languages" : [ {
+    "description" : "Bulgarian",
+    "twoLetterCode" : "bg",
+    "threeLetterCode" : "bul"
+  }, {
+    "description" : "Czech",
+    "twoLetterCode" : "cs",
+    "threeLetterCode" : "ces"
+  }, {
+    "description" : "Danish",
+    "twoLetterCode" : "da",
+    "threeLetterCode" : "dan"
+  }, {
+    "description" : "German",
+    "twoLetterCode" : "de",
+    "threeLetterCode" : "deu"
+  }, {
+    "description" : "Greek",
+    "twoLetterCode" : "el",
+    "threeLetterCode" : "ell"
+  }, {
+    "description" : "English",
+    "twoLetterCode" : "en",
+    "threeLetterCode" : "eng"
+  }, {
+    "description" : "Spanish",
+    "twoLetterCode" : "es",
+    "threeLetterCode" : "spa"
+  }, {
+    "description" : "Estonian",
+    "twoLetterCode" : "et",
+    "threeLetterCode" : "est"
+  }, {
+    "description" : "Finnish",
+    "twoLetterCode" : "fi",
+    "threeLetterCode" : "fin"
+  }, {
+    "description" : "French",
+    "twoLetterCode" : "fr",
+    "threeLetterCode" : "fra"
+  }, {
+    "description" : "Irish",
+    "twoLetterCode" : "ga",
+    "threeLetterCode" : "gle"
+  }, {
+    "description" : "Croatian",
+    "twoLetterCode" : "hr",
+    "threeLetterCode" : "hrv"
+  }, {
+    "description" : "Hungarian",
+    "twoLetterCode" : "hu",
+    "threeLetterCode" : "hun"
+  }, {
+    "description" : "Italian",
+    "twoLetterCode" : "it",
+    "threeLetterCode" : "ita"
+  }, {
+    "description" : "Lithuanian",
+    "twoLetterCode" : "lt",
+    "threeLetterCode" : "lit"
+  }, {
+    "description" : "Latvian",
+    "twoLetterCode" : "lv",
+    "threeLetterCode" : "lav"
+  }, {
+    "description" : "Maltese",
+    "twoLetterCode" : "mt",
+    "threeLetterCode" : "mlt"
+  }, {
+    "description" : "Dutch",
+    "twoLetterCode" : "nl",
+    "threeLetterCode" : "nld"
+  }, {
+    "description" : "Polish",
+    "twoLetterCode" : "pl",
+    "threeLetterCode" : "pol"
+  }, {
+    "description" : "Portuguese",
+    "twoLetterCode" : "pt",
+    "threeLetterCode" : "por"
+  }, {
+    "description" : "Romanian",
+    "twoLetterCode" : "ro",
+    "threeLetterCode" : "ron"
+  }, {
+    "description" : "Slovak",
+    "twoLetterCode" : "sk",
+    "threeLetterCode" : "slk"
+  }, {
+    "description" : "Slovenian",
+    "twoLetterCode" : "sl",
+    "threeLetterCode" : "slv"
+  }, {
+    "description" : "Swedish",
+    "twoLetterCode" : "sv",
+    "threeLetterCode" : "swe"
+  } ]
+}
\ No newline at end of file

From a680c64649b01e5a9e07f41fc279b7bbe1af8bac Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Fri, 6 Oct 2023 11:31:33 +0200
Subject: [PATCH 3/8] fields: Change check on codeList to issue errors
 (TEDEFO-2716)

---
 .../ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl      | 2 +-
 .../europa/ted/eforms/sdk/analysis/cucumber/tedefo-1806.feature | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
index 11b2e2b..5c63d82 100644
--- a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
+++ b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
@@ -193,5 +193,5 @@ rule "All fields of type code have a codelist property"
 when
   /fields[ $f: this, type == "code", codelistId == null ]
 then
-  results.add(new ValidationResult($f, "The field is of type code but does not have a 'codelist' property", ValidationStatusEnum.WARNING));
+  results.add(new ValidationResult($f, "The field is of type code but does not have a 'codelist' property", ValidationStatusEnum.ERROR));
 end
diff --git a/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-1806.feature b/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-1806.feature
index 7763a87..dc5ed77 100644
--- a/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-1806.feature
+++ b/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-1806.feature
@@ -18,7 +18,7 @@ Feature: Fields - Field validation
     When I load all fields
     And I execute validation
     Then Rule "<expected rule>" should have been fired
-    And I should get 2 SDK validation warnings
+    And I should get 2 SDK validation errors
 
     Examples:
       | expected rule                     |

From 6ec94b86cbfe647f25d84e522557e5cde378b466 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Tue, 17 Oct 2023 18:07:25 +0200
Subject: [PATCH 4/8] notice-types: Fix incorrect warnings on BT-735-LotResult

The check on all repeatable ancestors of a field was incorrect, and
would confuse a field identifier with another field identifier that is a
substring of it (BT-735-LotResult and BT-735-Lot).

Use equality operator instead of memberOf to avoid this.

Also update test data, to have this situation and detect incorrect
warnings.
---
 .../sdk/analysis/drools/noticeTypeRules.drl   |     2 +-
 .../tedefo-1845/valid/fields/fields.json      | 16152 +++++++++++-----
 .../tedefo-1845/valid/notice-types/1.json     |   483 +-
 .../tedefo-1845/valid/notice-types/2.json     |   486 +-
 .../tedefo-1845/valid/notice-types/3.json     |   486 +-
 .../tedefo-1845/valid/notice-types/38.json    |   184 +
 .../valid/notice-types/notice-types.json      |     9 +
 7 files changed, 11969 insertions(+), 5833 deletions(-)
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/38.json

diff --git a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/noticeTypeRules.drl b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/noticeTypeRules.drl
index bf19e59..8f71af7 100644
--- a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/noticeTypeRules.drl
+++ b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/noticeTypeRules.drl
@@ -174,7 +174,7 @@ end
 rule "All repeatable ancestors of a field are in the notice type definition"
 when
   $fieldIds : /noticeTypes[ $nt: this ]/contentFieldIds
-  $ancestorIds : /fields[ id memberOf $fieldIds, allRepeatableAncestors != null ]/allRepeatableAncestors.id
+  $ancestorIds : /fields[ id == $fieldIds, allRepeatableAncestors != null ]/allRepeatableAncestors.id
   not (exists /noticeTypes[ id == $nt.id, nodeIds contains $ancestorIds ])
 then
   results.add(new ValidationResult($nt, "The repeatable ancestor " + $ancestorIds + " of field " + $fieldIds + " should be present", ValidationStatusEnum.WARNING));
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/fields/fields.json b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/fields/fields.json
index be6610c..47a067c 100644
--- a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/fields/fields.json
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/fields/fields.json
@@ -1,9 +1,9 @@
 {
   "ublVersion" : "2.3",
-  "sdkVersion" : "eforms-sdk-1.6.0",
+  "sdkVersion" : "eforms-sdk-1.10.0-SNAPSHOT",
   "metadataDatabase" : {
-    "version" : "1.6.0",
-    "createdOn" : "2023-02-17T12:00:00"
+    "version" : "1.9.90",
+    "createdOn" : "2023-10-11T17:27:17"
   },
   "xmlStructure" : [ {
     "id" : "ND-Root",
@@ -57,13 +57,19 @@
     "parentId" : "ND-ProcedureProcurementScope",
     "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification",
     "xpathRelative" : "cac:MainCommodityClassification",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureContractAdditionalNature",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
     "repeatable" : true
   }, {
-    "id" : "ND-ProcedureMainClassificationCode",
-    "parentId" : "ND-ProcedureMainClassification",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
-    "repeatable" : false
+    "id" : "ND-ProcedureTransportServiceType",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "repeatable" : true
   }, {
     "id" : "ND-ProcedurePlacePerformanceAdditionalInformation",
     "parentId" : "ND-ProcedureProcurementScope",
@@ -125,12 +131,6 @@
     "parentId" : "ND-LotProcurementScope",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification",
     "xpathRelative" : "cac:MainCommodityClassification",
-    "repeatable" : true
-  }, {
-    "id" : "ND-LotMainClassificationCode",
-    "parentId" : "ND-LotMainClassification",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
     "repeatable" : false
   }, {
     "id" : "ND-LotDuration",
@@ -143,6 +143,18 @@
     "parentId" : "ND-LotProcurementScope",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
     "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotContractAdditionalNature",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEnvironmentalImpactType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
     "repeatable" : true
   }, {
     "id" : "ND-LotGreenCriteria",
@@ -150,6 +162,18 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
     "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
     "repeatable" : true
+  }, {
+    "id" : "ND-LotInnovativeAcquisitionType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotSocialObjectiveType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "repeatable" : true
   }, {
     "id" : "ND-StrategicProcurementType",
     "parentId" : "ND-LotProcurementScope",
@@ -198,6 +222,18 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms",
     "xpathRelative" : "cac:AuctionTerms",
     "repeatable" : false
+  }, {
+    "id" : "ND-LotDPSContractingSystem",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']",
+    "xpathRelative" : "cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotFAContractingSystem",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']",
+    "xpathRelative" : "cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']",
+    "repeatable" : false
   }, {
     "id" : "ND-SecondStage",
     "parentId" : "ND-LotTenderingProcess",
@@ -243,12 +279,6 @@
   }, {
     "id" : "ND-NonEsubmission",
     "parentId" : "ND-LotTenderingProcess",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification",
-    "xpathRelative" : "cac:ProcessJustification",
-    "repeatable" : true
-  }, {
-    "id" : "ND-NoESubmission",
-    "parentId" : "ND-LotTenderingProcess",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
     "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
     "repeatable" : false
@@ -282,24 +312,12 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms",
     "xpathRelative" : "cac:TenderingTerms",
     "repeatable" : false
-  }, {
-    "id" : "ND-SubcontractTerms",
-    "parentId" : "ND-LotTenderingTerms",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms",
-    "xpathRelative" : "cac:AllowedSubcontractTerms",
-    "repeatable" : true
-  }, {
-    "id" : "ND-AllowedSubcontracting",
-    "parentId" : "ND-LotTenderingTerms",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
-    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
-    "repeatable" : false
   }, {
     "id" : "ND-SubcontractingObligation",
     "parentId" : "ND-LotTenderingTerms",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
     "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
-    "repeatable" : false
+    "repeatable" : true
   }, {
     "id" : "ND-LotReviewTerms",
     "parentId" : "ND-LotTenderingTerms",
@@ -323,7 +341,7 @@
     "parentId" : "ND-AwardingTerms",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion",
     "xpathRelative" : "cac:AwardingCriterion",
-    "repeatable" : true
+    "repeatable" : false
   }, {
     "id" : "ND-LotAwardCriterion",
     "parentId" : "ND-LotAwardCriteria",
@@ -337,17 +355,101 @@
     "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
     "repeatable" : false
   }, {
-    "id" : "ND-LotAwardCriterionParameter",
+    "id" : "ND-LotAwardFixedCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberFixUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionFixNumberUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardThresholdCriterionParameter",
     "parentId" : "ND-LotAwardCriterionParameters",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter",
-    "xpathRelative" : "efac:AwardCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
     "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionThresholdNumberUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberThresholdUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardWeightCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionWeightNumberUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberWeightUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionDescriptionUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaNameUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionTypeUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberComplicatedUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaOrderJustificationUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "repeatable" : false
   }, {
     "id" : "ND-Prize",
     "parentId" : "ND-AwardingTerms",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize",
     "xpathRelative" : "cac:Prize",
     "repeatable" : true
+  }, {
+    "id" : "ND-AwardingTermsJuryMember",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:TechnicalCommitteePerson",
+    "xpathRelative" : "cac:TechnicalCommitteePerson",
+    "repeatable" : true
   }, {
     "id" : "ND-LotProcurementDocument",
     "parentId" : "ND-LotTenderingTerms",
@@ -355,16 +457,28 @@
     "xpathRelative" : "cac:CallForTendersDocumentReference",
     "repeatable" : true
   }, {
-    "id" : "ND-LotRestrictedDocuments",
-    "parentId" : "ND-LotTenderingTerms",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']",
-    "xpathRelative" : "cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']",
+    "id" : "ND-LotDocAllNonOfficialLanguages",
+    "parentId" : "ND-LotProcurementDocument",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDocNonOfficialLanguage",
+    "parentId" : "ND-LotDocAllNonOfficialLanguages",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages/cac:Language",
+    "xpathRelative" : "cac:Language",
     "repeatable" : true
   }, {
-    "id" : "ND-LotDocumentsReference",
-    "parentId" : "ND-LotTenderingTerms",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference[not(cbc:DocumentType/text()='restricted-document')]",
-    "xpathRelative" : "cac:CallForTendersDocumentReference[not(cbc:DocumentType/text()='restricted-document')]",
+    "id" : "ND-LotDocAllOfficialLanguages",
+    "parentId" : "ND-LotProcurementDocument",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDocOfficialLanguage",
+    "parentId" : "ND-LotDocAllOfficialLanguages",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages/cac:Language",
+    "xpathRelative" : "cac:Language",
     "repeatable" : true
   }, {
     "id" : "ND-ExecutionRequirements",
@@ -378,6 +492,24 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
     "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
     "repeatable" : true
+  }, {
+    "id" : "ND-LotECatalog",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='ecatalog-submission']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='ecatalog-submission']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotEInvoicing",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='einvoicing']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='einvoicing']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotESignature",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='esignature-submission']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='esignature-submission']",
+    "repeatable" : false
   }, {
     "id" : "ND-NDA",
     "parentId" : "ND-LotTenderingTerms",
@@ -385,7 +517,7 @@
     "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
     "repeatable" : false
   }, {
-    "id" : "ND-ReservedExecution",
+    "id" : "ND-LotReservedExecution",
     "parentId" : "ND-LotTenderingTerms",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
     "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
@@ -396,6 +528,12 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList",
     "xpathRelative" : "cac:EconomicOperatorShortList",
     "repeatable" : false
+  }, {
+    "id" : "ND-PreselectedParticipant",
+    "parentId" : "ND-Participants",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList/cac:PreSelectedParty",
+    "xpathRelative" : "cac:PreSelectedParty",
+    "repeatable" : true
   }, {
     "id" : "ND-LotEmploymentLegislation",
     "parentId" : "ND-LotTenderingTerms",
@@ -414,6 +552,12 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference",
     "xpathRelative" : "cac:FiscalLegislationDocumentReference",
     "repeatable" : false
+  }, {
+    "id" : "ND-LotSubmissionLanguage",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:Language",
+    "xpathRelative" : "cac:Language",
+    "repeatable" : true
   }, {
     "id" : "ND-PaymentTerms",
     "parentId" : "ND-LotTenderingTerms",
@@ -421,7 +565,7 @@
     "xpathRelative" : "cac:PaymentTerms",
     "repeatable" : false
   }, {
-    "id" : "ND-PostAwarProcess",
+    "id" : "ND-PostAwardProcess",
     "parentId" : "ND-LotTenderingTerms",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess",
     "xpathRelative" : "cac:PostAwardProcess",
@@ -459,8 +603,8 @@
   }, {
     "id" : "ND-LateTendererInformation",
     "parentId" : "ND-LotTenderingTerms",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
-    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='missing-info-submission']",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='missing-info-submission']",
     "repeatable" : false
   }, {
     "id" : "ND-TenderRecipient",
@@ -487,10 +631,16 @@
     "xpathRelative" : "efac:SelectionCriteria",
     "repeatable" : true
   }, {
-    "id" : "ND-SecondStageCriterionParameter",
+    "id" : "ND-SecondStageThresholdCriterionParameter",
+    "parentId" : "ND-SelectionCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xpathRelative" : "efac:CriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "repeatable" : true
+  }, {
+    "id" : "ND-SecondStageWeightCriterionParameter",
     "parentId" : "ND-SelectionCriteria",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter",
-    "xpathRelative" : "efac:CriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xpathRelative" : "efac:CriterionParameter[efbc:ParameterCode/@listName='number-weight']",
     "repeatable" : false
   }, {
     "id" : "ND-StrategicProcurementLot",
@@ -504,6 +654,12 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:StrategicProcurement/efac:StrategicProcurementInformation",
     "xpathRelative" : "efac:StrategicProcurementInformation",
     "repeatable" : true
+  }, {
+    "id" : "ND-SubcontractingIndication",
+    "parentId" : "ND-NonUBLTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:TenderSubcontractingRequirements",
+    "xpathRelative" : "efac:TenderSubcontractingRequirements",
+    "repeatable" : true
   }, {
     "id" : "ND-Part",
     "parentId" : "ND-Root",
@@ -529,12 +685,6 @@
     "parentId" : "ND-PartProcurementScope",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:MainCommodityClassification",
     "xpathRelative" : "cac:MainCommodityClassification",
-    "repeatable" : true
-  }, {
-    "id" : "ND-PartMainClassificationCode",
-    "parentId" : "ND-PartMainClassification",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
     "repeatable" : false
   }, {
     "id" : "ND-PartDuration",
@@ -543,10 +693,10 @@
     "xpathRelative" : "cac:PlannedPeriod",
     "repeatable" : false
   }, {
-    "id" : "ND-PartAdditionalNature",
+    "id" : "ND-PartContractAdditionalNature",
     "parentId" : "ND-PartProcurementScope",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:ProcurementAdditionalType",
-    "xpathRelative" : "cac:ProcurementAdditionalType",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
     "repeatable" : true
   }, {
     "id" : "ND-PartPlacePerformance",
@@ -578,6 +728,18 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod",
     "xpathRelative" : "cac:AdditionalInformationRequestPeriod",
     "repeatable" : false
+  }, {
+    "id" : "ND-PartDPSContractingSystem",
+    "parentId" : "ND-PartTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']",
+    "xpathRelative" : "cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-PartFAContractingSystem",
+    "parentId" : "ND-PartTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']",
+    "xpathRelative" : "cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']",
+    "repeatable" : false
   }, {
     "id" : "ND-PartPreviousPlanning",
     "parentId" : "ND-PartTenderingProcess",
@@ -609,17 +771,35 @@
     "xpathRelative" : "cac:CallForTendersDocumentReference",
     "repeatable" : true
   }, {
-    "id" : "ND-PartRestrictedDocuments",
-    "parentId" : "ND-PartTenderingTerms",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']",
-    "xpathRelative" : "cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']",
+    "id" : "ND-PartDocAllNonOfficialLanguages",
+    "parentId" : "ND-PartProcurementDocument",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages",
+    "repeatable" : false
+  }, {
+    "id" : "ND-PartDocNonOfficialLanguage",
+    "parentId" : "ND-PartDocAllNonOfficialLanguages",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages/cac:Language",
+    "xpathRelative" : "cac:Language",
     "repeatable" : true
   }, {
-    "id" : "ND-PartDocumentsReference",
-    "parentId" : "ND-PartTenderingTerms",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference[not(cbc:DocumentType/text()='restricted-document')]",
-    "xpathRelative" : "cac:CallForTendersDocumentReference[not(cbc:DocumentType/text()='restricted-document')]",
+    "id" : "ND-PartDocAllOfficialLanguages",
+    "parentId" : "ND-PartProcurementDocument",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages",
+    "repeatable" : false
+  }, {
+    "id" : "ND-PartDocOfficialLanguage",
+    "parentId" : "ND-PartDocAllOfficialLanguages",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages/cac:Language",
+    "xpathRelative" : "cac:Language",
     "repeatable" : true
+  }, {
+    "id" : "ND-PartReservedExecution",
+    "parentId" : "ND-PartTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "repeatable" : false
   }, {
     "id" : "ND-PartEmploymentLegislation",
     "parentId" : "ND-PartTenderingTerms",
@@ -662,17 +842,65 @@
     "xpathAbsolute" : "/*/cac:TenderingProcess",
     "xpathRelative" : "cac:TenderingProcess",
     "repeatable" : false
+  }, {
+    "id" : "ND-PreviousNoticeReference",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "repeatable" : true
   }, {
     "id" : "ND-AcceleratedProcedure",
     "parentId" : "ND-ProcedureTenderingProcess",
     "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
     "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
     "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedJustificationUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "repeatable" : false
   }, {
     "id" : "ND-DirectAward",
     "parentId" : "ND-ProcedureTenderingProcess",
     "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
     "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "repeatable" : true
+  }, {
+    "id" : "ND-DirectAwardJustificationCodeUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationPreviousUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationTextUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureFeaturesUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTypeUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
     "repeatable" : false
   }, {
     "id" : "ND-ProcedureTerms",
@@ -692,12 +920,24 @@
     "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup",
     "xpathRelative" : "cac:LotsGroup",
     "repeatable" : true
+  }, {
+    "id" : "ND-GroupCompositionLotReference",
+    "parentId" : "ND-GroupComposition",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cac:ProcurementProjectLotReference",
+    "xpathRelative" : "cac:ProcurementProjectLotReference",
+    "repeatable" : true
   }, {
     "id" : "ND-CrossBorderLaw",
     "parentId" : "ND-ProcedureTerms",
     "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
     "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
     "repeatable" : false
+  }, {
+    "id" : "ND-CrossBorderLawUnpublish",
+    "parentId" : "ND-CrossBorderLaw",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "repeatable" : false
   }, {
     "id" : "ND-LocalLegalBasisNoID",
     "parentId" : "ND-ProcedureTerms",
@@ -752,6 +992,12 @@
     "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealDecision",
     "xpathRelative" : "efac:AppealDecision",
     "repeatable" : true
+  }, {
+    "id" : "ND-AppealedItemReference",
+    "parentId" : "ND-ReviewStatus",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealedItem",
+    "xpathRelative" : "efac:AppealedItem",
+    "repeatable" : true
   }, {
     "id" : "ND-AppealingParty",
     "parentId" : "ND-ReviewStatus",
@@ -777,122 +1023,4028 @@
     "xpathRelative" : "efac:AppealRemedy",
     "repeatable" : true
   }, {
-    "id" : "ND-Organizations",
+    "id" : "ND-Changes",
     "parentId" : "ND-RootExtension",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations",
-    "xpathRelative" : "efac:Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes",
+    "xpathRelative" : "efac:Changes",
     "repeatable" : false
   }, {
-    "id" : "ND-Organization",
-    "parentId" : "ND-Organizations",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization",
-    "xpathRelative" : "efac:Organization",
-    "repeatable" : true,
-    "identifierFieldId" : "OPT-200-Organization-Company",
-    "captionFieldId" : "BT-500-Organization-Company"
+    "id" : "ND-Change",
+    "parentId" : "ND-Changes",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:Change",
+    "xpathRelative" : "efac:Change",
+    "repeatable" : true
   }, {
-    "id" : "ND-Company",
-    "parentId" : "ND-Organization",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company",
-    "xpathRelative" : "efac:Company",
+    "id" : "ND-ChangedSection",
+    "parentId" : "ND-Change",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:Change/efac:ChangedSection",
+    "xpathRelative" : "efac:ChangedSection",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ChangeReason",
+    "parentId" : "ND-Changes",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:ChangeReason",
+    "xpathRelative" : "efac:ChangeReason",
     "repeatable" : false
   }, {
-    "id" : "ND-WinningParty",
-    "parentId" : "ND-Organization",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company[(cac:PartyIdentification/cbc:ID/text() = //efac:TenderingParty/efac:Tenderer/cbc:ID/text()) or (cac:PartyIdentification/cbc:ID/text() = //efac:TenderingParty/efac:Subcontractor/cbc:ID/text())]",
-    "xpathRelative" : "efac:Company[(cac:PartyIdentification/cbc:ID/text() = //efac:TenderingParty/efac:Tenderer/cbc:ID/text()) or (cac:PartyIdentification/cbc:ID/text() = //efac:TenderingParty/efac:Subcontractor/cbc:ID/text())]",
+    "id" : "ND-ContractModification",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification",
+    "xpathRelative" : "efac:ContractModification",
+    "repeatable" : true
+  }, {
+    "id" : "ND-Modification",
+    "parentId" : "ND-ContractModification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification/efac:Change",
+    "xpathRelative" : "efac:Change",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ModifiedSection",
+    "parentId" : "ND-Modification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification/efac:Change/efac:ChangedSection",
+    "xpathRelative" : "efac:ChangedSection",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ModificationReason",
+    "parentId" : "ND-ContractModification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:ContractModification/efac:ChangeReason",
+    "xpathRelative" : "efac:ChangeReason",
     "repeatable" : false
   }, {
-    "id" : "ND-CompanyContact",
-    "parentId" : "ND-Company",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact",
-    "xpathRelative" : "cac:Contact",
+    "id" : "ND-NoticeResult",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult",
+    "xpathRelative" : "efac:NoticeResult",
     "repeatable" : false
   }, {
-    "id" : "ND-CompanyAddress",
-    "parentId" : "ND-Company",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress",
-    "xpathRelative" : "cac:PostalAddress",
+    "id" : "ND-NoticeApproximateValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
     "repeatable" : false
   }, {
-    "id" : "ND-Touchpoint",
-    "parentId" : "ND-Organization",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint",
-    "xpathRelative" : "efac:TouchPoint",
-    "repeatable" : true,
-    "identifierFieldId" : "OPT-201-Organization-TouchPoint",
-    "captionFieldId" : "BT-500-Organization-TouchPoint"
+    "id" : "ND-NoticeMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "repeatable" : false
   }, {
-    "id" : "ND-TouchpointContact",
-    "parentId" : "ND-Touchpoint",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact",
-    "xpathRelative" : "cac:Contact",
+    "id" : "ND-NoticeValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
     "repeatable" : false
   }, {
-    "id" : "ND-TouchpointAddress",
-    "parentId" : "ND-Touchpoint",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress",
-    "xpathRelative" : "cac:PostalAddress",
+    "id" : "ND-NoticeResultGroupFA",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework",
+    "xpathRelative" : "efac:GroupFramework",
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupMaximalValueIdentifierUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
     "repeatable" : false
   }, {
-    "id" : "ND-UBO",
-    "parentId" : "ND-Organizations",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner",
-    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "id" : "ND-GroupMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupReestimatedValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResult",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult",
+    "xpathRelative" : "efac:LotResult",
     "repeatable" : true,
-    "identifierFieldId" : "OPT-202-UBO",
-    "captionFieldId" : "BT-500-UBO"
+    "identifierFieldId" : "OPT-322-LotResult",
+    "captionFieldId" : "BT-13713-LotResult"
   }, {
-    "id" : "ND-UBOContact",
-    "parentId" : "ND-UBO",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact",
-    "xpathRelative" : "cac:Contact",
+    "id" : "ND-FinancingParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:FinancingParty",
+    "xpathRelative" : "cac:FinancingParty",
+    "repeatable" : true
+  }, {
+    "id" : "ND-PayerParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:PayerParty",
+    "xpathRelative" : "cac:PayerParty",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatistics",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsCountUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
     "repeatable" : false
   }, {
-    "id" : "ND-UBOAddress",
-    "parentId" : "ND-UBO",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress",
-    "xpathRelative" : "cac:ResidenceAddress",
+    "id" : "ND-ReviewRequestsStatisticsTypeUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
     "repeatable" : false
   }, {
-    "id" : "ND-Publication",
-    "parentId" : "ND-RootExtension",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication",
-    "xpathRelative" : "efac:Publication",
+    "id" : "ND-BuyerReviewComplainants",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
     "repeatable" : false
-  } ],
-  "fields" : [ {
-    "id" : "BT-01(c)-Procedure",
-    "parentNodeId" : "ND-LocalLegalBasisWithID",
-    "name" : "Procedure Legal Basis (ID)",
-    "btId" : "BT-01",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]/cbc:ID[not(text()=('CrossBorderLaw','LocalLegalBasis'))]",
-    "xpathRelative" : "cbc:ID[not(text()=('CrossBorderLaw','LocalLegalBasis'))]",
-    "type" : "id",
-    "legalType" : "CODE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    }
   }, {
-    "id" : "BT-01(d)-Procedure",
-    "parentNodeId" : "ND-LocalLegalBasisWithID",
-    "name" : "Procedure Legal Basis (Description)",
+    "id" : "ND-RevewRequestsUnpublish",
+    "parentId" : "ND-BuyerReviewComplainants",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-NotAwardedReasonUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xpathRelative" : "efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueHighestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueLowestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinnerChosenUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultFAValues",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues",
+    "xpathRelative" : "efac:FrameworkAgreementValues",
+    "repeatable" : false
+  }, {
+    "id" : "ND-MaximalValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReestimatedValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultTenderReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissions",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics",
+    "xpathRelative" : "efac:ReceivedSubmissionsStatistics",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissionCountUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReceivedSubmissionTypeUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultContractReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementLotResult",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement",
+    "xpathRelative" : "efac:StrategicProcurement",
+    "repeatable" : false
+  }, {
+    "id" : "ND-StrategicProcurementInformationLotResult",
+    "parentId" : "ND-StrategicProcurementLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation",
+    "xpathRelative" : "efac:StrategicProcurementInformation",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementDetailsLotResult",
+    "parentId" : "ND-StrategicProcurementInformationLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails",
+    "xpathRelative" : "efac:ProcurementDetails",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementStatistics",
+    "parentId" : "ND-ProcurementDetailsLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics",
+    "xpathRelative" : "efac:StrategicProcurementStatistics",
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotTender",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-321-Tender",
+    "captionFieldId" : "BT-3201-Tender"
+  }, {
+    "id" : "ND-TenderAggregatedAmounts",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts",
+    "xpathRelative" : "efac:AggregatedAmounts",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenue",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue",
+    "xpathRelative" : "efac:ConcessionRevenue",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueBuyerUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueUserUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-ValueConcessionDescriptionUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-RewardsPenalties",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevenueAllocation",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-OtherContractExecutionConditions",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xpathRelative" : "efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderRankUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderValueUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderVariantUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderOriginCountry",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin",
+    "xpathRelative" : "efac:Origin",
+    "repeatable" : true
+  }, {
+    "id" : "ND-CountryOriginUnpublish",
+    "parentId" : "ND-LotTenderOriginCountry",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedContract",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xpathRelative" : "efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingUnpublish",
+    "parentId" : "ND-SubcontractedContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingDescriptionUnpublish",
+    "parentId" : "ND-SubcontractedContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageKnownUnpublish",
+    "parentId" : "ND-SubcontractedContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageUnpublish",
+    "parentId" : "ND-SubcontractedContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueKnownUnpublish",
+    "parentId" : "ND-SubcontractedContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueUnpublish",
+    "parentId" : "ND-SubcontractedContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "repeatable" : false
+  }, {
+    "id" : "ND-SettledContract",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-316-Contract",
+    "captionFieldId" : "BT-150-Contract"
+  }, {
+    "id" : "ND-ContractSignatory",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/cac:SignatoryParty",
+    "xpathRelative" : "cac:SignatoryParty",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExtendedDurationJustification",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification",
+    "xpathRelative" : "efac:DurationJustification",
+    "repeatable" : false
+  }, {
+    "id" : "ND-AssetList",
+    "parentId" : "ND-ExtendedDurationJustification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList",
+    "xpathRelative" : "efac:AssetsList",
+    "repeatable" : false
+  }, {
+    "id" : "ND-Asset",
+    "parentId" : "ND-AssetList",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset",
+    "xpathRelative" : "efac:Asset",
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractEUFunds",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding",
+    "xpathRelative" : "efac:Funding",
+    "repeatable" : true
+  }, {
+    "id" : "ND-SettledContractTenderReference",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderingParty",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty",
+    "xpathRelative" : "efac:TenderingParty",
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-210-Tenderer"
+  }, {
+    "id" : "ND-SubContractor",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor",
+    "xpathRelative" : "efac:SubContractor",
+    "repeatable" : true
+  }, {
+    "id" : "ND-SubContractorTakerReference",
+    "parentId" : "ND-SubContractor",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor/efac:MainContractor",
+    "xpathRelative" : "efac:MainContractor",
+    "repeatable" : true
+  }, {
+    "id" : "ND-Tenderer",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:Tenderer",
+    "xpathRelative" : "efac:Tenderer",
+    "repeatable" : true
+  }, {
+    "id" : "ND-Organizations",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations",
+    "xpathRelative" : "efac:Organizations",
+    "repeatable" : false
+  }, {
+    "id" : "ND-Organization",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization",
+    "xpathRelative" : "efac:Organization",
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-200-Organization-Company",
+    "captionFieldId" : "BT-500-Organization-Company"
+  }, {
+    "id" : "ND-Company",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company",
+    "xpathRelative" : "efac:Company",
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyContact",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyLegalEntity",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity",
+    "xpathRelative" : "cac:PartyLegalEntity",
+    "repeatable" : true
+  }, {
+    "id" : "ND-CompanyAddress",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "repeatable" : false
+  }, {
+    "id" : "ND-Touchpoint",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint",
+    "xpathRelative" : "efac:TouchPoint",
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-201-Organization-TouchPoint",
+    "captionFieldId" : "BT-500-Organization-TouchPoint"
+  }, {
+    "id" : "ND-TouchpointContact",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "repeatable" : false
+  }, {
+    "id" : "ND-TouchpointAddress",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "repeatable" : false
+  }, {
+    "id" : "ND-OrganizationUboReference",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "repeatable" : true
+  }, {
+    "id" : "ND-UBO",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-202-UBO",
+    "captionFieldId" : "BT-500-UBO"
+  }, {
+    "id" : "ND-UBOContact",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBOAddress",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress",
+    "xpathRelative" : "cac:ResidenceAddress",
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBONationality",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/efac:Nationality",
+    "xpathRelative" : "efac:Nationality",
+    "repeatable" : true
+  }, {
+    "id" : "ND-Publication",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication",
+    "xpathRelative" : "efac:Publication",
+    "repeatable" : false
+  } ],
+  "fields" : [ {
+    "id" : "BT-01(c)-Procedure",
+    "parentNodeId" : "ND-LocalLegalBasisWithID",
+    "name" : "Procedure Legal Basis (ID)",
+    "btId" : "BT-01",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-01(c)-Procedure-Scheme",
+    "parentNodeId" : "ND-LocalLegalBasisWithID",
+    "name" : "Procedure Legal Basis (ID) Schemename",
+    "btId" : "BT-01",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]/cbc:ID/@schemeName",
+    "xpathRelative" : "cbc:ID/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-01(c)-Procedure",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-01(d)-Procedure",
+    "parentNodeId" : "ND-LocalLegalBasisWithID",
+    "name" : "Procedure Legal Basis (Description)",
     "btId" : "BT-01",
     "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]/cbc:DocumentDescription",
     "xpathRelative" : "cbc:DocumentDescription",
     "type" : "text-multilingual",
     "legalType" : "CODE",
-    "maxLength" : 400,
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-01(d)-Procedure-Language",
+    "parentNodeId" : "ND-LocalLegalBasisWithID",
+    "name" : "Procedure Legal Basis (Description) Language",
+    "btId" : "BT-01",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]/cbc:DocumentDescription/@languageID",
+    "xpathRelative" : "cbc:DocumentDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-01(d)-Procedure",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-01(e)-Procedure",
+    "parentNodeId" : "ND-LocalLegalBasisNoID",
+    "name" : "Procedure Legal Basis (NoID)",
+    "btId" : "BT-01",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "presetValue" : "LocalLegalBasis",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-01(f)-Procedure",
+    "parentNodeId" : "ND-LocalLegalBasisNoID",
+    "name" : "Procedure Legal Basis (NoID Description)",
+    "btId" : "BT-01",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']/cbc:DocumentDescription",
+    "xpathRelative" : "cbc:DocumentDescription",
+    "type" : "text-multilingual",
+    "legalType" : "CODE",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LocalLegalBasisNoID} ${BT-01(e)-Procedure is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-01(f)-Procedure-Language",
+    "parentNodeId" : "ND-LocalLegalBasisNoID",
+    "name" : "Procedure Legal Basis (NoID Description) Language",
+    "btId" : "BT-01",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']/cbc:DocumentDescription/@languageID",
+    "xpathRelative" : "cbc:DocumentDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-01(f)-Procedure",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-01-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Procedure Legal Basis",
+    "btId" : "BT-01",
+    "xpathAbsolute" : "/*/cbc:RegulatoryDomain",
+    "xpathRelative" : "cbc:RegulatoryDomain",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-legal-basis",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-02-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Type",
+    "btId" : "BT-02",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode",
+    "xpathRelative" : "cbc:NoticeTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "notice-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-Root} ${((BT-01-notice == '32014L0023') and (BT-02-notice in ('pin-cfc-social','cn-standard','veat','can-standard','can-social','can-modif'))) or not(BT-01-notice == '32014L0023')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0100"
+      }, {
+        "value" : "{ND-Root} ${((OPP-070-notice in ('14','19','28','32','35','40') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0023')) and not(BT-531-Procedure == 'supplies') and not(BT-531-Lot == 'supplies') and not(BT-531-Part == 'supplies')) or not(OPP-070-notice in ('14','19','28','32','35','40') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0023'))}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0101"
+      }, {
+        "value" : "{ND-Root} ${((OPP-070-notice in ('1','4','7','10','12','16','20','23','25','29','33','36','38') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0024')) and not(BT-02-notice == 'subco')) or not(OPP-070-notice in ('1','4','7','10','12','16','20','23','25','29','33','36','38') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0024'))}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0102"
+      }, {
+        "value" : "{ND-Root} ${((BT-03-notice == 'bri') and (BT-02-notice in (bri))) or not(BT-03-notice == 'bri')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0103"
+      }, {
+        "value" : "{ND-Root} ${((BT-03-notice == 'competition') and (BT-02-notice in (competition))) or not(BT-03-notice == 'competition')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0105"
+      }, {
+        "value" : "{ND-Root} ${((BT-03-notice == 'cont-modif') and (BT-02-notice in (cont-modif))) or not(BT-03-notice == 'cont-modif')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0106"
+      }, {
+        "value" : "{ND-Root} ${((BT-03-notice == 'dir-awa-pre') and (BT-02-notice in (dir-awa-pre))) or not(BT-03-notice == 'dir-awa-pre')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0107"
+      }, {
+        "value" : "{ND-Root} ${((BT-03-notice == 'planning') and (BT-02-notice in (planning))) or not(BT-03-notice == 'planning')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0108"
+      }, {
+        "value" : "{ND-Root} ${((BT-03-notice == 'result') and (BT-02-notice in (result))) or not(BT-03-notice == 'result')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00002-0109"
+      } ]
+    }
+  }, {
+    "id" : "BT-03-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Form Type",
+    "btId" : "BT-03",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode/@listName",
+    "xpathRelative" : "cbc:NoticeTypeCode/@listName",
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-02-notice",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "form-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-04-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Procedure Identifier",
+    "btId" : "BT-04",
+    "xpathAbsolute" : "/*/cbc:ContractFolderID",
+    "xpathRelative" : "cbc:ContractFolderID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-05(a)-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Dispatch Date",
+    "btId" : "BT-05",
+    "xpathAbsolute" : "/*/cbc:IssueDate",
+    "xpathRelative" : "cbc:IssueDate",
+    "type" : "date",
+    "presetValue" : "{NOW}",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-Root} ${((BT-758-notice is present) and ((BT-05(a)-notice > BT-630(d)-Lot) or (BT-05(a)-notice > BT-131(d)-Lot) or (BT-05(a)-notice > BT-1311(d)-Lot)) and not(BT-140-notice in ('cancel','cancel-intent'))) or not((BT-758-notice is present) and ((BT-05(a)-notice > BT-630(d)-Lot) or (BT-05(a)-notice > BT-131(d)-Lot) or (BT-05(a)-notice > BT-1311(d)-Lot)))}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00005-0151"
+      } ]
+    }
+  }, {
+    "id" : "BT-05(b)-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Dispatch Time",
+    "btId" : "BT-05",
+    "xpathAbsolute" : "/*/cbc:IssueTime",
+    "xpathRelative" : "cbc:IssueTime",
+    "type" : "time",
+    "presetValue" : "{NOW}",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "strategic-procurement",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-09(a)-Procedure",
+    "parentNodeId" : "ND-CrossBorderLaw",
+    "name" : "Cross Border Law",
+    "btId" : "BT-09",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "presetValue" : "CrossBorderLaw",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "38", "39", "40", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^CrossBorderLaw$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-09(b)-Procedure",
+    "parentNodeId" : "ND-CrossBorderLaw",
+    "name" : "Cross Border Law Description",
+    "btId" : "BT-09",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/cbc:DocumentDescription",
+    "xpathRelative" : "cbc:DocumentDescription",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 1000,
+    "privacy" : {
+      "code" : "cro-bor-law",
+      "unpublishedFieldId" : "BT-195(BT-09)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-09)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-09)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-09)-Procedure"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "38", "39", "40", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "condition" : "{ND-CrossBorderLaw} ${BT-09(a)-Procedure is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-09(b)-Procedure-Language",
+    "parentNodeId" : "ND-CrossBorderLaw",
+    "name" : "Cross Border Law Description Language",
+    "btId" : "BT-09",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/cbc:DocumentDescription/@languageID",
+    "xpathRelative" : "cbc:DocumentDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-09(b)-Procedure",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-10-Procedure-Buyer",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Activity Authority",
+    "btId" : "BT-10",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingActivity/cbc:ActivityTypeCode[@listName='authority-activity']",
+    "xpathRelative" : "cac:ContractingActivity/cbc:ActivityTypeCode[@listName='authority-activity']",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "22", "38", "39", "40", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "2", "3", "5", "6", "8", "9", "11", "12", "13", "14", "15", "17", "18", "19", "20", "21", "24", "25", "26", "27", "28", "30", "31", "32", "33", "34", "35", "37", "T01", "T02" ],
+        "condition" : "{ND-ContractingParty} ${BT-11-Procedure-Buyer not in ('body-pl','body-pl-cga','body-pl-la','body-pl-ra','cga','def-cont','eu-ins-bod-ag','grp-p-aut','int-org','la','org-sub','org-sub-cga','org-sub-la','org-sub-ra','ra')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "4", "5", "7", "8", "10", "11", "14", "15", "16", "17", "19", "23", "24", "29", "30", "32", "35", "36", "37", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "authority-activity",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-105-Procedure",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "Procedure Type",
+    "btId" : "BT-105",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:ProcedureCode",
+    "xpathRelative" : "cbc:ProcedureCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "privacy" : {
+      "code" : "pro-typ",
+      "unpublishedFieldId" : "BT-195(BT-105)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-105)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-105)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-105)-Procedure"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "22", "32", "35", "38", "39", "40", "CEI", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "10", "11", "16", "17", "18", "23", "24", "25", "26", "27", "28", "29", "30", "31", "36", "37", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "procurement-procedure-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('16','29','E5')) and (BT-105-Procedure is present) and (BT-01-notice == '32014L0024')}",
+        "value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('open', 'restricted', 'neg-w-call')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00105-0110"
+      }, {
+        "condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('18','31','E5')) and (BT-105-Procedure is present) and (BT-01-notice == '32009L0081')}",
+        "value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('restricted', 'neg-w-call')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00105-0111"
+      }, {
+        "condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('17','30','E5')) and (BT-105-Procedure is present) and (BT-01-notice == '32014L0025')}",
+        "value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('open', 'restricted', 'neg-w-call','comp-dial')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00105-0112"
+      } ]
+    }
+  }, {
+    "id" : "BT-105-Procedure-List",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "Procedure Type Listname",
+    "btId" : "BT-105",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:ProcedureCode/@listName",
+    "xpathRelative" : "cbc:ProcedureCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-105-Procedure",
+    "presetValue" : "procurement-procedure-type",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-106-Procedure",
+    "parentNodeId" : "ND-AcceleratedProcedure",
+    "name" : "Procedure Accelerated",
+    "btId" : "BT-106",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode",
+    "xpathRelative" : "cbc:ProcessReasonCode",
+    "type" : "code",
+    "legalType" : "INDICATOR",
+    "privacy" : {
+      "code" : "pro-acc",
+      "unpublishedFieldId" : "BT-195(BT-106)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-106)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-106)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-106)-Procedure"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16", "17", "18", "29", "30", "31" ],
+        "condition" : "{ND-AcceleratedProcedure} ${BT-105-Procedure not in ('open','restricted','neg-w-call')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "17" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16" ],
+        "condition" : "{ND-AcceleratedProcedure} ${BT-105-Procedure in ('open','restricted')}",
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "18" ],
+        "condition" : "{ND-AcceleratedProcedure} ${BT-105-Procedure in ('neg-w-call','restricted')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "accelerated-procedure",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-106-Procedure-List",
+    "parentNodeId" : "ND-AcceleratedProcedure",
+    "name" : "Procedure Accelerated Listname",
+    "btId" : "BT-106",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode/@listName",
+    "xpathRelative" : "cbc:ProcessReasonCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-106-Procedure",
+    "presetValue" : "accelerated-procedure",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-109-Lot",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification",
+    "xpathRelative" : "cbc:Justification",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "10", "12", "16", "20" ],
+        "condition" : "{ND-FA} ${BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc') or not(((BT-537-Lot - BT-536-Lot) > P4Y) or (BT-36-Lot > P4Y))}",
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "8", "11", "13", "17", "21" ],
+        "condition" : "{ND-FA} ${BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc') or not(((BT-537-Lot - BT-536-Lot) > P8Y) or (BT-36-Lot > P8Y))}",
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "9", "18", "22" ],
+        "condition" : "{ND-FA} ${BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc') or not(((BT-537-Lot - BT-536-Lot) > P7Y) or (BT-36-Lot > P7Y))}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "16", "17", "18", "22" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-109-Lot-Language",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification Language",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification/@languageID",
+    "xpathRelative" : "cbc:Justification/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-109-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-11-Procedure-Buyer",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Buyer Legal Type",
+    "btId" : "BT-11",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']",
+    "xpathRelative" : "cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "38", "39", "40", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "4", "7", "10", "14", "16", "19", "23", "29", "32", "35", "36", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-buyer-legal-type",
+        "type" : "flat",
+        "parentId" : "buyer-legal-type"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-11-Procedure-Buyer-List",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Buyer Legal Type Listname",
+    "btId" : "BT-11",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']/@listName",
+    "xpathRelative" : "cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-11-Procedure-Buyer",
+    "presetValue" : "buyer-legal-type",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-111-Lot",
+    "parentNodeId" : "ND-FABuyerCategories",
+    "name" : "Framework Buyer Categories",
+    "btId" : "BT-111",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "16", "17", "18", "20", "21", "22", "25", "26", "27", "29", "30", "31", "33", "34" ],
+        "condition" : "{ND-FABuyerCategories} ${BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-111-Lot-Language",
+    "parentNodeId" : "ND-FABuyerCategories",
+    "name" : "Framework Buyer Categories Language",
+    "btId" : "BT-111",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-111-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-1118-NoticeResult",
+    "parentNodeId" : "ND-NoticeResult",
+    "name" : "Notice Framework Approximate Value",
+    "btId" : "BT-1118",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efbc:OverallApproximateFrameworkContractsAmount",
+    "xpathRelative" : "efbc:OverallApproximateFrameworkContractsAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
+    "privacy" : {
+      "code" : "not-app-val",
+      "unpublishedFieldId" : "BT-195(BT-1118)-NoticeResult",
+      "reasonCodeFieldId" : "BT-197(BT-1118)-NoticeResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-1118)-NoticeResult",
+      "publicationDateFieldId" : "BT-198(BT-1118)-NoticeResult"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "28", "32", "35", "36", "37", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "29", "30", "31", "33", "34" ],
+        "condition" : "{ND-NoticeResult} ${not(BT-142-LotResult[BT-13713-LotResult in BT-137-Lot[BT-765-Lot in ('fa-mix','fa-w-rc','fa-wo-rc')]] == 'selec-w') or (BT-660-LotResult is not present)}",
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "26", "27", "38", "39" ],
+        "condition" : "{ND-NoticeResult} ${(BT-13713-LotResult in BT-137-Lot[BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')]) or (BT-660-LotResult is not present)}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "25", "26", "27", "29", "30", "31", "33", "34", "38", "39" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-NoticeResult} ${BT-1118-NoticeResult is present}",
+        "value" : "{ND-NoticeResult} ${(not(BT-1561-NoticeResult is present) and ((every text:$faEstCurr in (BT-660-LotResult/@currencyID) satisfies $faEstCurr == BT-1118-NoticeResult/@currencyID) and (BT-1118-NoticeResult == sum(BT-660-LotResult)))) or (BT-1561-NoticeResult is present) or not(every text:$faEst in (BT-660-LotResult/@currencyID) satisfies $faEst == BT-1118-NoticeResult/@currencyID)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-01118-0100"
+      } ]
+    }
+  }, {
+    "id" : "BT-1118-NoticeResult-Currency",
+    "parentNodeId" : "ND-NoticeResult",
+    "name" : "Notice Framework Approximate Value Currency",
+    "btId" : "BT-1118",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efbc:OverallApproximateFrameworkContractsAmount/@currencyID",
+    "xpathRelative" : "efbc:OverallApproximateFrameworkContractsAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-1118-NoticeResult",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-currency",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-113-Lot",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Maximum Participants Number",
+    "btId" : "BT-113",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:MaximumOperatorQuantity",
+    "xpathRelative" : "cbc:MaximumOperatorQuantity",
+    "type" : "integer",
+    "legalType" : "NUMBER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "16", "17", "18", "20", "21", "22" ],
+        "condition" : "{ND-FA} ${BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "16", "18" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-115-Lot",
+    "parentNodeId" : "ND-LotTenderingProcess",
+    "name" : "GPA Coverage",
+    "btId" : "BT-115",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:GovernmentAgreementConstraintIndicator",
+    "xpathRelative" : "cbc:GovernmentAgreementConstraintIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "9", "12", "13", "14", "18", "20", "21", "22", "23", "24", "27", "31", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "19", "28", "32", "38", "39", "40" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-11-Procedure-Buyer not in ('cga','ra','la','body-pl','body-pl-cga','body-pl-ra','body-pl-la','pub-undert','pub-undert-cga','pub-undert-ra','pub-undert-la','org-sub-cga','org-sub-ra','org-sub-la','def-cont','int-org','eu-ins-bod-ag')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "10", "11", "15", "16", "17", "19", "25", "26", "28", "29", "30", "32" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotTenderingProcess} ${OPP-070-notice in ('14','19','28','32','35','40') and (BT-115-Lot is present) and (BT-23-Lot == 'services')}",
+        "value" : "{ND-LotTenderingProcess} ${BT-115-Lot == FALSE}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00115-0150"
+      } ]
+    }
+  }, {
+    "id" : "BT-115-Part",
+    "parentNodeId" : "ND-PartTenderingProcess",
+    "name" : "GPA Coverage",
+    "btId" : "BT-115",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cbc:GovernmentAgreementConstraintIndicator",
+    "xpathRelative" : "cbc:GovernmentAgreementConstraintIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5" ],
+        "condition" : "{ND-PartTenderingProcess} ${BT-11-Procedure-Buyer not in ('cga','ra','la','body-pl','body-pl-cga','body-pl-ra','body-pl-la','pub-undert','pub-undert-cga','pub-undert-ra','pub-undert-la','org-sub-cga','org-sub-ra','org-sub-la','def-cont','int-org','eu-ins-bod-ag')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-120-Lot",
+    "parentNodeId" : "ND-AwardingTerms",
+    "name" : "No Negotiation Necessary",
+    "btId" : "BT-120",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cbc:NoFurtherNegotiationIndicator",
+    "xpathRelative" : "cbc:NoFurtherNegotiationIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "17", "18", "19", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-122-Lot",
+    "parentNodeId" : "ND-AuctionTerms",
+    "name" : "Electronic Auction Description",
+    "btId" : "BT-122",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-123-Lot",
+    "parentNodeId" : "ND-AuctionTerms",
+    "name" : "Electronic Auction URL",
+    "btId" : "BT-123",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms/cbc:AuctionURI",
+    "xpathRelative" : "cbc:AuctionURI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-124-Lot",
+    "parentNodeId" : "ND-LotTenderingProcess",
+    "name" : "Tool Atypical URL",
+    "btId" : "BT-124",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:AccessToolsURI",
+    "xpathRelative" : "cbc:AccessToolsURI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-124-Part",
+    "parentNodeId" : "ND-PartTenderingProcess",
+    "name" : "Tool Atypical URL",
+    "btId" : "BT-124",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cbc:AccessToolsURI",
+    "xpathRelative" : "cbc:AccessToolsURI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-125(i)-Lot",
+    "parentNodeId" : "ND-LotPreviousPlanning",
+    "name" : "Previous Planning Identifier",
+    "btId" : "BT-125",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|(\\d{1,8})-(19|20)\\d\\d)$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-125(i)-Part",
+    "parentNodeId" : "ND-PartPreviousPlanning",
+    "name" : "Previous Planning Identifier",
+    "btId" : "BT-125",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|(\\d{1,8})-(19|20)\\d\\d)$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-1251-Lot",
+    "parentNodeId" : "ND-LotPreviousPlanning",
+    "name" : "Previous Planning Part Identifier",
+    "btId" : "BT-1251",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ReferencedDocumentInternalAddress",
+    "xpathRelative" : "cbc:ReferencedDocumentInternalAddress",
+    "type" : "text",
+    "legalType" : "IDENTIFIER",
+    "maxLength" : 30,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-125(i)-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-1251-Part",
+    "parentNodeId" : "ND-PartPreviousPlanning",
+    "name" : "Previous Planning Part Identifier",
+    "btId" : "BT-1251",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ReferencedDocumentInternalAddress",
+    "xpathRelative" : "cbc:ReferencedDocumentInternalAddress",
+    "type" : "text",
+    "legalType" : "IDENTIFIER",
+    "maxLength" : 30,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPreviousPlanning} ${BT-125(i)-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-1252-Procedure",
+    "parentNodeId" : "ND-DirectAward",
+    "name" : "Direct Award Justification Previous Procedure Identifier",
+    "btId" : "BT-1252",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text",
+    "legalType" : "IDENTIFIER",
+    "privacy" : {
+      "code" : "dir-awa-pre",
+      "unpublishedFieldId" : "BT-195(BT-1252)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-1252)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-1252)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-1252)-Procedure"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-127-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Future Notice",
+    "btId" : "BT-127",
+    "xpathAbsolute" : "/*/cbc:PlannedDate",
+    "xpathRelative" : "cbc:PlannedDate",
+    "type" : "date",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-Root} ${(BT-127-notice > BT-05(a)-notice) or not(BT-127-notice is present) or not(BT-05(a)-notice is present)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00127-0100"
+      } ]
+    }
+  }, {
+    "id" : "BT-13(d)-Lot",
+    "parentNodeId" : "ND-LotInfoRequestPeriod",
+    "name" : "Additional Information Deadline",
+    "btId" : "BT-13",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
+    "type" : "date",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-13(d)-Part",
+    "parentNodeId" : "ND-PartInfoRequestPeriod",
+    "name" : "Additional Information Deadline",
+    "btId" : "BT-13",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
+    "type" : "date",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-13(t)-Lot",
+    "parentNodeId" : "ND-LotInfoRequestPeriod",
+    "name" : "Additional Information Deadline",
+    "btId" : "BT-13",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndTime",
+    "xpathRelative" : "cbc:EndTime",
+    "type" : "time",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-13(t)-Part",
+    "parentNodeId" : "ND-PartInfoRequestPeriod",
+    "name" : "Additional Information Deadline",
+    "btId" : "BT-13",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndTime",
+    "xpathRelative" : "cbc:EndTime",
+    "type" : "time",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-130-Lot",
+    "parentNodeId" : "ND-LotTenderingProcess",
+    "name" : "Dispatch Invitation Tender",
+    "btId" : "BT-130",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:InvitationSubmissionPeriod/cbc:StartDate",
+    "xpathRelative" : "cac:InvitationSubmissionPeriod/cbc:StartDate",
+    "type" : "date",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-105-Procedure == 'open'}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-LotTenderingProcess} ${(BT-631-Lot < BT-130-Lot) or not(BT-631-Lot is present) or not(BT-130-Lot is present)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00130-0100"
+      } ]
+    }
+  }, {
+    "id" : "BT-131(d)-Lot",
+    "parentNodeId" : "ND-SubmissionDeadline",
+    "name" : "Deadline Receipt Tenders",
+    "btId" : "BT-131",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
+    "type" : "date",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "9", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-1311(d)-Lot is present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "8" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16", "17", "18", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-105-Procedure == 'open' or (BT-105-Procedure == 'oth-mult' and (BT-1311(d)-Lot is not present)) or (BT-105-Procedure == 'oth-single' and (BT-1311(d)-Lot is not present))}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotTenderingProcess} ${(BT-131(d)-Lot is present) and (BT-13(d)-Lot is present)}",
+        "value" : "{ND-LotTenderingProcess} ${BT-13(d)-Lot <= BT-131(d)-Lot}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00131-0150"
+      }, {
+        "condition" : "{ND-LotTenderingProcess} ${(BT-131(d)-Lot is present) and (BT-05(a)-notice is present)}",
+        "value" : "{ND-LotTenderingProcess} ${BT-131(d)-Lot > BT-05(a)-notice}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00131-0151"
+      } ]
+    }
+  }, {
+    "id" : "BT-131(t)-Lot",
+    "parentNodeId" : "ND-SubmissionDeadline",
+    "name" : "Deadline Receipt Tenders",
+    "btId" : "BT-131",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod/cbc:EndTime",
+    "xpathRelative" : "cbc:EndTime",
+    "type" : "time",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "9", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-131(d)-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-1311(d)-Lot",
+    "parentNodeId" : "ND-ParticipationRequestPeriod",
+    "name" : "Deadline Receipt Requests",
+    "btId" : "BT-1311",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
+    "type" : "date",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "8", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "9", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-131(d)-Lot is present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "16", "17", "18", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-LotTenderingProcess} ${(BT-105-Procedure == 'oth-mult' and (BT-131(d)-Lot is not present)) or (BT-105-Procedure == 'oth-single' and (BT-131(d)-Lot is not present))}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotTenderingProcess} ${(BT-766-Lot in ('dps-list', 'dps-nlist')) and (BT-537-Lot is present) and (BT-1311(d)-Lot is present) }",
+        "value" : "{ND-LotTenderingProcess} ${BT-1311(d)-Lot == BT-537-Lot}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-01311-0150"
+      }, {
+        "condition" : "{ND-LotTenderingProcess} ${(BT-1311(d)-Lot is present) and (BT-130-Lot is present)}",
+        "value" : "{ND-LotTenderingProcess} ${(BT-1311(d)-Lot < BT-130-Lot)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-01311-0152"
+      }, {
+        "condition" : "{ND-LotTenderingProcess} ${(BT-1311(d)-Lot is present) and (BT-13(d)-Lot is present)}",
+        "value" : "{ND-LotTenderingProcess} ${BT-13(d)-Lot <= BT-1311(d)-Lot}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-01311-0153"
+      } ]
+    }
+  }, {
+    "id" : "BT-1311(t)-Lot",
+    "parentNodeId" : "ND-ParticipationRequestPeriod",
+    "name" : "Deadline Receipt Requests",
+    "btId" : "BT-1311",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod/cbc:EndTime",
+    "xpathRelative" : "cbc:EndTime",
+    "type" : "time",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "8", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "9", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-LotTenderingProcess} ${BT-1311(d)-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "9", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-132(d)-Lot",
+    "parentNodeId" : "ND-PublicOpening",
+    "name" : "Public Opening Date",
+    "btId" : "BT-132",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cbc:OccurrenceDate",
+    "xpathRelative" : "cbc:OccurrenceDate",
+    "type" : "date",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16", "17", "20", "21" ],
+        "condition" : "{ND-LotTenderingProcess} ${not(BT-105-Procedure == 'open')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-PublicOpening} ${(BT-132(d)-Lot is present) and (BT-1311(d)-Lot is present)}",
+        "value" : "{ND-PublicOpening} ${BT-132(d)-Lot > BT-1311(d)-Lot}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00132-0150"
+      }, {
+        "condition" : "{ND-PublicOpening} ${(BT-132(d)-Lot is present) and (BT-131(d)-Lot is present)}",
+        "value" : "{ND-PublicOpening} ${BT-132(d)-Lot >= BT-131(d)-Lot}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00132-0151"
+      } ]
+    }
+  }, {
+    "id" : "BT-132(t)-Lot",
+    "parentNodeId" : "ND-PublicOpening",
+    "name" : "Public Opening Date",
+    "btId" : "BT-132",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cbc:OccurrenceTime",
+    "xpathRelative" : "cbc:OccurrenceTime",
+    "type" : "time",
+    "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16", "17", "20", "21" ],
+        "condition" : "{ND-PublicOpening} ${not(BT-105-Procedure == 'open')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-133-Lot",
+    "parentNodeId" : "ND-PublicOpeningPlace",
+    "name" : "Public Opening Place",
+    "btId" : "BT-133",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cac:OccurenceLocation/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 1000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16", "17" ],
+        "condition" : "{ND-PublicOpening} ${not(BT-105-Procedure == 'open')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-134-Lot",
+    "parentNodeId" : "ND-PublicOpening",
+    "name" : "Public Opening Description",
+    "btId" : "BT-134",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16", "17", "20", "21" ],
+        "condition" : "{ND-PublicOpening} ${not(BT-105-Procedure == 'open')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-135-Procedure",
+    "parentNodeId" : "ND-DirectAward",
+    "name" : "Direct Award Justification Text",
+    "btId" : "BT-135",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/cbc:ProcessReason",
+    "xpathRelative" : "cbc:ProcessReason",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "privacy" : {
+      "code" : "dir-awa-tex",
+      "unpublishedFieldId" : "BT-195(BT-135)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-135)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-135)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-135)-Procedure"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "33", "34" ],
+        "condition" : "{ND-DirectAward} ${not(BT-105-Procedure == 'neg-wo-call')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-1351-Procedure",
+    "parentNodeId" : "ND-AcceleratedProcedure",
+    "name" : "Procedure Accelerated Justification",
+    "btId" : "BT-1351",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReason",
+    "xpathRelative" : "cbc:ProcessReason",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 4000,
+    "privacy" : {
+      "code" : "pro-acc-jus",
+      "unpublishedFieldId" : "BT-195(BT-1351)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-1351)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-1351)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-1351)-Procedure"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "16", "17", "18", "29", "30", "31" ],
+        "condition" : "{ND-AcceleratedProcedure} ${not(BT-106-Procedure == 'true')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "16", "18" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-136-Procedure",
+    "parentNodeId" : "ND-DirectAward",
+    "name" : "Direct Award Justification Code",
+    "btId" : "BT-136",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/cbc:ProcessReasonCode",
+    "xpathRelative" : "cbc:ProcessReasonCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "privacy" : {
+      "code" : "dir-awa-jus",
+      "unpublishedFieldId" : "BT-195(BT-136)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-136)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-136)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-136)-Procedure"
+    },
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "38", "39", "40", "CEI", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "33", "34", "T01" ],
+        "condition" : "{ND-DirectAward} ${not(BT-105-Procedure == 'neg-wo-call')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "T01" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "direct-award-justification",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "idScheme" : "LOT",
+    "schemeName" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^LOT-\\d{4}$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-Lot} ${BT-137-Lot is unique in /BT-137-Lot}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00137-0201"
+      }, {
+        "condition" : "{ND-Lot} ${(OPP-070-notice in ('E1','T01','7','8','9','10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28')) and (count(/BT-137-Lot) > 1)}",
+        "value" : "{ND-Lot} ${BT-137-Lot != 'LOT-0000'}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00137-0207"
+      }, {
+        "condition" : "{ND-Lot} ${(OPP-070-notice in ('25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5')) and BT-13713-LotResult is present}",
+        "value" : "{ND-Lot} ${(BT-137-Lot in BT-13713-LotResult)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00137-0209"
+      } ]
+    }
+  }, {
+    "id" : "BT-137-Part",
+    "parentNodeId" : "ND-Part",
+    "name" : "Purpose Lot Identifier",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "idScheme" : "PAR",
+    "schemeName" : "Part",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^PAR-\\d{4}$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-Part} ${BT-137-Part is unique in /BT-137-Part}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00137-0202"
+      }, {
+        "condition" : "{ND-Part} ${(OPP-070-notice in ('4','5','6','E2')) and (count(/BT-137-Part) > 1)}",
+        "value" : "{ND-Part} ${BT-137-Part != 'PAR-0000'}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00137-0208"
+      } ]
+    }
+  }, {
+    "id" : "BT-14-Lot",
+    "parentNodeId" : "ND-LotProcurementDocument",
+    "name" : "Documents Restricted",
+    "btId" : "BT-14",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentType",
+    "xpathRelative" : "cbc:DocumentType",
+    "type" : "code",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "16", "17", "19", "23", "24", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "document-distribution",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-14-Part",
+    "parentNodeId" : "ND-PartProcurementDocument",
+    "name" : "Documents Restricted",
+    "btId" : "BT-14",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentType",
+    "xpathRelative" : "cbc:DocumentType",
+    "type" : "code",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "document-distribution",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-15-Lot",
+    "parentNodeId" : "ND-LotProcurementDocument",
+    "name" : "Documents URL",
+    "btId" : "BT-15",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cac:Attachment[../cbc:DocumentType/text()='non-restricted-document']/cac:ExternalReference/cbc:URI",
+    "xpathRelative" : "cac:Attachment[../cbc:DocumentType/text()='non-restricted-document']/cac:ExternalReference/cbc:URI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-LotProcurementDocument} ${not(BT-14-Lot == 'non-restricted-document')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-15-Part",
+    "parentNodeId" : "ND-PartProcurementDocument",
+    "name" : "Documents URL",
+    "btId" : "BT-15",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cac:Attachment[../cbc:DocumentType/text()='non-restricted-document']/cac:ExternalReference/cbc:URI",
+    "xpathRelative" : "cac:Attachment[../cbc:DocumentType/text()='non-restricted-document']/cac:ExternalReference/cbc:URI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartProcurementDocument} ${not(BT-14-Part == 'non-restricted-document')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-16-Organization-Company",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Organisation Part Name",
+    "btId" : "BT-16",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:Department",
+    "xpathRelative" : "cbc:Department",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 1000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-16-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "Part Name",
+    "btId" : "BT-16",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:Department",
+    "xpathRelative" : "cbc:Department",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 1000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-165-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Winner Size",
+    "btId" : "BT-165",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/efbc:CompanySizeCode",
+    "xpathRelative" : "efbc:CompanySizeCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "economic-operator-size",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-17-Lot",
+    "parentNodeId" : "ND-LotTenderingProcess",
+    "name" : "SubmissionElectronic",
+    "btId" : "BT-17",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:SubmissionMethodCode[@listName='esubmission']",
+    "xpathRelative" : "cbc:SubmissionMethodCode[@listName='esubmission']",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "10", "11", "15", "16", "17", "23", "24", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "esubmission",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-18-Lot",
+    "parentNodeId" : "ND-TenderRecipient",
+    "name" : "Submission URL",
+    "btId" : "BT-18",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty/cbc:EndpointID",
+    "xpathRelative" : "cbc:EndpointID",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-LotTenderingTerms} ${BT-17-Lot == 'not-allowed'}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "10", "11", "16", "17", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-19-Lot",
+    "parentNodeId" : "ND-NonEsubmission",
+    "name" : "Submission Nonelectronic Justification",
+    "btId" : "BT-19",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']/cbc:ProcessReasonCode",
+    "xpathRelative" : "cbc:ProcessReasonCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-NonEsubmission} ${not(BT-17-Lot == 'not-allowed')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "no-esubmission-justification",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-21-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Title",
+    "btId" : "BT-21",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:Name",
+    "xpathRelative" : "cbc:Name",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-21-Part",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Title",
+    "btId" : "BT-21",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Name",
+    "xpathRelative" : "cbc:Name",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-21-Procedure",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Title",
+    "btId" : "BT-21",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Name",
+    "xpathRelative" : "cbc:Name",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-22-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Internal Identifier",
+    "btId" : "BT-22",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-22-Part",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Internal Identifier",
+    "btId" : "BT-22",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-22-Procedure",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Internal Identifier",
+    "btId" : "BT-22",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-23-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Main Nature",
+    "btId" : "BT-23",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:ProcurementTypeCode[@listName='contract-nature']",
+    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='contract-nature']",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-contract-nature",
+        "type" : "flat",
+        "parentId" : "contract-nature"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotProcurementScope} ${(OPP-070-notice in ('14','19','28','32','35','40')) and (BT-23-Lot is present)}",
+        "value" : "{ND-LotProcurementScope} ${BT-23-Lot != 'supplies'}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00023-0200"
+      }, {
+        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot is present) and (BT-531-Lot is present)}",
+        "value" : "{ND-LotProcurementScope} ${not(BT-23-Lot in BT-531-Lot)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00023-0203"
+      } ]
+    }
+  }, {
+    "id" : "BT-23-Part",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Main Nature",
+    "btId" : "BT-23",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:ProcurementTypeCode[@listName='contract-nature']",
+    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='contract-nature']",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-contract-nature",
+        "type" : "flat",
+        "parentId" : "contract-nature"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part is present) and (BT-531-Part is present)}",
+        "value" : "{ND-PartProcurementScope} ${not(BT-23-Part in BT-531-Part)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00023-0204"
+      } ]
+    }
+  }, {
+    "id" : "BT-23-Part-List",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Main Nature Listname",
+    "btId" : "BT-23",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:ProcurementTypeCode[@listName='contract-nature']/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='contract-nature']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-23-Part",
+    "presetValue" : "contract-nature",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-23-Procedure",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Main Nature",
+    "btId" : "BT-23",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-contract-nature",
+        "type" : "flat",
+        "parentId" : "contract-nature"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-ProcedureProcurementScope} ${(OPP-070-notice in ('14','19','28','32','35','40')) and (BT-23-Procedure is present)}",
+        "value" : "{ND-ProcedureProcurementScope} ${BT-23-Procedure != 'supplies'}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00023-0201"
+      }, {
+        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure is present) and (BT-531-Procedure is present)}",
+        "value" : "{ND-ProcedureProcurementScope} ${BT-23-Procedure not in BT-531-Procedure}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00023-0202"
+      } ]
+    }
+  }, {
+    "id" : "BT-23-Procedure-List",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Main Nature Listname",
+    "btId" : "BT-23",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-23-Procedure",
+    "presetValue" : "contract-nature",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-24-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Description",
+    "btId" : "BT-24",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-24-Part",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Description",
+    "btId" : "BT-24",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-24-Part-Language",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Description Language",
+    "btId" : "BT-24",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-24-Part",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-24-Procedure",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Description",
+    "btId" : "BT-24",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-24-Procedure-Language",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Description Language",
+    "btId" : "BT-24",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-24-Procedure",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-25-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Quantity",
+    "btId" : "BT-25",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:EstimatedOverallContractQuantity",
+    "xpathRelative" : "cbc:EstimatedOverallContractQuantity",
+    "type" : "number",
+    "legalType" : "NUMBER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-26(a)-Lot",
+    "parentNodeId" : "ND-LotAdditionalClassification",
+    "name" : "Classification Type (e.g. CPV)",
+    "btId" : "BT-26",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode/@listName",
+    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-263-Lot",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotAdditionalClassification} ${BT-263-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "classification-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-26(a)-Part",
+    "parentNodeId" : "ND-PartAdditionalClassification",
+    "name" : "Classification Type (e.g. CPV)",
+    "btId" : "BT-26",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode/@listName",
+    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-263-Part",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartAdditionalClassification} ${BT-263-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "classification-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-26(a)-Procedure",
+    "parentNodeId" : "ND-ProcedureAdditionalCommodityClassification",
+    "name" : "Classification Type (e.g. CPV)",
+    "btId" : "BT-26",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode/@listName",
+    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-263-Procedure",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-ProcedureAdditionalCommodityClassification} ${BT-263-Procedure is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "classification-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-26(m)-Lot",
+    "parentNodeId" : "ND-LotMainClassification",
+    "name" : "Classification Type (e.g. CPV)",
+    "btId" : "BT-26",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode/@listName",
+    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-262-Lot",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "classification-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-26(m)-Part",
+    "parentNodeId" : "ND-PartMainClassification",
+    "name" : "Classification Type (e.g. CPV)",
+    "btId" : "BT-26",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode/@listName",
+    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-262-Part",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "classification-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-26(m)-Procedure",
+    "parentNodeId" : "ND-ProcedureMainClassification",
+    "name" : "Classification Type (e.g. CPV)",
+    "btId" : "BT-26",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode/@listName",
+    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-262-Procedure",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "classification-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-262-Lot",
+    "parentNodeId" : "ND-LotMainClassification",
+    "name" : "Main Classification Code",
+    "btId" : "BT-262",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
+    "xpathRelative" : "cbc:ItemClassificationCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "cpv",
+        "type" : "hierarchical"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotProcurementScope} ${(BT-71-Lot == 'res-pub-ser') and (BT-262-Lot is present)}",
+        "value" : "{ND-LotProcurementScope} ${BT-262-Lot in ('75121000', '75122000', '75123000', '79622000', '79624000', '79625000', '80110000', '80300000', '80420000', '80430000', '80511000', '80520000', '80590000', '85000000', '85100000', '85110000', '85111000', '85111100', '85111200', '85111300', '85111310', '85111320', '85111400', '85111500', '85111600', '85111700', '85111800', '85111810', '85111820', '85111900', '85112000', '85112100', '85112200', '85120000', '85121000', '85121100', '85121200', '85121210', '85121220', '85121230', '85121231', '85121232', '85121240', '85121250', '85121251', '85121252', '85121270', '85121271', '85121280', '85121281', '85121282', '85121283', '85121290', '85121291', '85121292', '85121300', '85130000', '85131000', '85131100', '85131110', '85140000', '85141000', '85141100', '85141200', '85141210', '85141211', '85141220', '85142000', '85142100', '85142200', '85142300', '85142400', '85143000', '85144000', '85144100', '85145000', '85146000', '85146100', '85146200', '85147000', '85148000', '85149000', '85150000', '85160000', '85170000', '85171000', '85172000', '85200000', '85210000', '85300000', '85310000', '85311000', '85311100', '85311200', '85311300', '85312000', '85312100', '85312110', '85312120', '85312200', '85312300', '85312310', '85312320', '85312330', '85312400', '85312500', '85312510', '85320000', '85321000', '85322000', '85323000',  '92500000', '92600000', '98133000', '98133110')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0200"
+      }, {
+        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot == 'supplies') and (BT-262-Lot is present)}",
+        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'0') or starts-with(BT-262-Lot,'1') or starts-with(BT-262-Lot,'2') or starts-with(BT-262-Lot,'3') or starts-with(BT-262-Lot,'40') or starts-with(BT-262-Lot,'41') or starts-with(BT-262-Lot,'42') or starts-with(BT-262-Lot,'43') or starts-with(BT-262-Lot,'44') or starts-with(BT-262-Lot,'48')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0203"
+      }, {
+        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot == 'works') and (BT-262-Lot is present)}",
+        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'45')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0206"
+      }, {
+        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot == 'services') and (BT-262-Lot is present)}",
+        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'49') or starts-with(BT-262-Lot,'5') or starts-with(BT-262-Lot,'6') or starts-with(BT-262-Lot,'7') or starts-with(BT-262-Lot,'8') or starts-with(BT-262-Lot,'9')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0209"
+      }, {
+        "condition" : "{ND-LotProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Lot is present)}",
+        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'45') or starts-with(BT-262-Lot,'49') or starts-with(BT-262-Lot,'5') or starts-with(BT-262-Lot,'6') or starts-with(BT-262-Lot,'7') or starts-with(BT-262-Lot,'8') or starts-with(BT-262-Lot,'9')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0212"
+      } ]
+    }
+  }, {
+    "id" : "BT-262-Part",
+    "parentNodeId" : "ND-PartMainClassification",
+    "name" : "Main Classification Code",
+    "btId" : "BT-262",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
+    "xpathRelative" : "cbc:ItemClassificationCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "cpv",
+        "type" : "hierarchical"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-PartProcurementScope} ${(BT-71-Part == 'res-pub-ser') and (BT-262-Part is present)}",
+        "value" : "{ND-PartProcurementScope} ${BT-262-Part in ('75121000', '75122000', '75123000', '79622000', '79624000', '79625000', '80110000', '80300000', '80420000', '80430000', '80511000', '80520000', '80590000', '85000000', '85100000', '85110000', '85111000', '85111100', '85111200', '85111300', '85111310', '85111320', '85111400', '85111500', '85111600', '85111700', '85111800', '85111810', '85111820', '85111900', '85112000', '85112100', '85112200', '85120000', '85121000', '85121100', '85121200', '85121210', '85121220', '85121230', '85121231', '85121232', '85121240', '85121250', '85121251', '85121252', '85121270', '85121271', '85121280', '85121281', '85121282', '85121283', '85121290', '85121291', '85121292', '85121300', '85130000', '85131000', '85131100', '85131110', '85140000', '85141000', '85141100', '85141200', '85141210', '85141211', '85141220', '85142000', '85142100', '85142200', '85142300', '85142400', '85143000', '85144000', '85144100', '85145000', '85146000', '85146100', '85146200', '85147000', '85148000', '85149000', '85150000', '85160000', '85170000', '85171000', '85172000', '85200000', '85210000', '85300000', '85310000', '85311000', '85311100', '85311200', '85311300', '85312000', '85312100', '85312110', '85312120', '85312200', '85312300', '85312310', '85312320', '85312330', '85312400', '85312500', '85312510', '85320000', '85321000', '85322000', '85323000',  '92500000', '92600000', '98133000', '98133110')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0201"
+      }, {
+        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part == 'supplies') and (BT-262-Part is present)}",
+        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'0') or starts-with(BT-262-Part,'1') or starts-with(BT-262-Part,'2') or starts-with(BT-262-Part,'3') or starts-with(BT-262-Part,'40') or starts-with(BT-262-Part,'41') or starts-with(BT-262-Part,'42') or starts-with(BT-262-Part,'43') or starts-with(BT-262-Part,'44') or starts-with(BT-262-Part,'48')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0204"
+      }, {
+        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part == 'works') and (BT-262-Part is present)}",
+        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'45')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0207"
+      }, {
+        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part == 'services') and (BT-262-Part is present)}",
+        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'49') or starts-with(BT-262-Part,'5') or starts-with(BT-262-Part,'6') or starts-with(BT-262-Part,'7') or starts-with(BT-262-Part,'8') or starts-with(BT-262-Part,'9')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0210"
+      }, {
+        "condition" : "{ND-PartProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Part is present)}",
+        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'45') or starts-with(BT-262-Part,'49') or starts-with(BT-262-Part,'5') or starts-with(BT-262-Part,'6') or starts-with(BT-262-Part,'7') or starts-with(BT-262-Part,'8') or starts-with(BT-262-Part,'9')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0213"
+      } ]
+    }
+  }, {
+    "id" : "BT-262-Procedure",
+    "parentNodeId" : "ND-ProcedureMainClassification",
+    "name" : "Main Classification Code",
+    "btId" : "BT-262",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
+    "xpathRelative" : "cbc:ItemClassificationCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "cpv",
+        "type" : "hierarchical"
+      },
+      "severity" : "ERROR"
+    },
+    "inChangeNotice" : {
+      "value" : {
+        "canAdd" : true,
+        "canModify" : true,
+        "canRemove" : true
+      },
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-ProcedureMainClassification} ${notice(BT-758-notice)/OPP-070-notice in ('10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5') and (notice(BT-758-notice)/BT-262-Procedure is present)}",
+        "value" : {
+          "canModify" : false
+        },
+        "severity" : "ERROR"
+      } ]
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure == 'supplies') and (BT-262-Procedure is present)}",
+        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'0') or starts-with(BT-262-Procedure,'1') or starts-with(BT-262-Procedure,'2') or starts-with(BT-262-Procedure,'3') or starts-with(BT-262-Procedure,'40') or starts-with(BT-262-Procedure,'41') or starts-with(BT-262-Procedure,'42') or starts-with(BT-262-Procedure,'43') or starts-with(BT-262-Procedure,'44') or starts-with(BT-262-Procedure,'48')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0202"
+      }, {
+        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure == 'works') and (BT-262-Procedure is present)}",
+        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'45')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0205"
+      }, {
+        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure == 'services') and (BT-262-Procedure is present)}",
+        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'49') or starts-with(BT-262-Procedure,'5') or starts-with(BT-262-Procedure,'6') or starts-with(BT-262-Procedure,'7') or starts-with(BT-262-Procedure,'8') or starts-with(BT-262-Procedure,'9')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0208"
+      }, {
+        "condition" : "{ND-ProcedureProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Procedure is present)}",
+        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'45') or starts-with(BT-262-Procedure,'49') or starts-with(BT-262-Procedure,'5') or starts-with(BT-262-Procedure,'6') or starts-with(BT-262-Procedure,'7') or starts-with(BT-262-Procedure,'8') or starts-with(BT-262-Procedure,'9')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00262-0211"
+      } ]
+    }
+  }, {
+    "id" : "BT-263-Lot",
+    "parentNodeId" : "ND-LotAdditionalClassification",
+    "name" : "Additional Classification Code",
+    "btId" : "BT-263",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode",
+    "xpathRelative" : "cbc:ItemClassificationCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -901,20 +5053,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "cpv",
+        "type" : "hierarchical"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-01(e)-Procedure",
-    "parentNodeId" : "ND-LocalLegalBasisNoID",
-    "name" : "Procedure Legal Basis (NoID)",
-    "btId" : "BT-01",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']/cbc:ID[text()='LocalLegalBasis']",
-    "xpathRelative" : "cbc:ID[text()='LocalLegalBasis']",
-    "type" : "id",
-    "presetValue" : "LocalLegalBasis",
+    "id" : "BT-263-Part",
+    "parentNodeId" : "ND-PartAdditionalClassification",
+    "name" : "Additional Classification Code",
+    "btId" : "BT-263",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode",
+    "xpathRelative" : "cbc:ItemClassificationCode",
+    "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
@@ -924,21 +5082,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "cpv",
+        "type" : "hierarchical"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-01(f)-Procedure",
-    "parentNodeId" : "ND-LocalLegalBasisNoID",
-    "name" : "Procedure Legal Basis (NoID Description)",
-    "btId" : "BT-01",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']/cbc:DocumentDescription",
-    "xpathRelative" : "cbc:DocumentDescription",
-    "type" : "text-multilingual",
+    "id" : "BT-263-Procedure",
+    "parentNodeId" : "ND-ProcedureAdditionalCommodityClassification",
+    "name" : "Additional Classification Code",
+    "btId" : "BT-263",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode",
+    "xpathRelative" : "cbc:ItemClassificationCode",
+    "type" : "code",
     "legalType" : "CODE",
-    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -951,144 +5115,155 @@
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "cpv",
+        "type" : "hierarchical"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-01-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Procedure Legal Basis",
-    "btId" : "BT-01",
-    "xpathAbsolute" : "/*/cbc:RegulatoryDomain",
-    "xpathRelative" : "cbc:RegulatoryDomain",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-27-Lot",
+    "parentNodeId" : "ND-LotValueEstimate",
+    "name" : "Estimated Value",
+    "btId" : "BT-27",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount",
+    "xpathRelative" : "cbc:EstimatedOverallContractAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-27-Lot-Currency",
+    "parentNodeId" : "ND-LotValueEstimate",
+    "name" : "Estimated Value Currency",
+    "btId" : "BT-27",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount/@currencyID",
+    "xpathRelative" : "cbc:EstimatedOverallContractAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-27-Lot",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-legal-basis",
+        "id" : "eforms-currency",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-02-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Type",
-    "btId" : "BT-02",
-    "xpathAbsolute" : "/*/cbc:NoticeTypeCode",
-    "xpathRelative" : "cbc:NoticeTypeCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-27-Part",
+    "parentNodeId" : "ND-PartValueEstimate",
+    "name" : "Estimated Value",
+    "btId" : "BT-27",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount",
+    "xpathRelative" : "cbc:EstimatedOverallContractAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-27-Part-Currency",
+    "parentNodeId" : "ND-PartValueEstimate",
+    "name" : "Estimated Value Currency",
+    "btId" : "BT-27",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount/@currencyID",
+    "xpathRelative" : "cbc:EstimatedOverallContractAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-27-Part",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "notice-type",
+        "id" : "eforms-currency",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-Root} ${((BT-01-notice == '32014L0023') and (BT-02-notice in ('pin-cfc-social','cn-standard','veat','can-standard','can-social'))) or not(BT-01-notice == '32014L0023')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0100"
-      }, {
-        "value" : "{ND-Root} ${((OPP-070-notice in ('14','19','28','32','35','40') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0023')) and not(BT-531-Procedure == 'supplies') and not(BT-531-Lot == 'supplies') and not(BT-531-Part == 'supplies')) or not(OPP-070-notice in ('14','19','28','32','35','40') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0023'))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0101"
-      }, {
-        "value" : "{ND-Root} ${((OPP-070-notice in ('1','4','7','10','12','16','20','23','25','29','33','36','38') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0024')) and not(BT-02-notice == 'subco')) or not(OPP-070-notice in ('1','4','7','10','12','16','20','23','25','29','33','36','38') or (OPP-070-notice == 'E5' and BT-01-notice == '32014L0024'))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0102"
-      }, {
-        "value" : "{ND-Root} ${((BT-03-notice == 'bri') and (BT-02-notice in (bri))) or not(BT-03-notice == 'bri')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0103"
-      }, {
-        "value" : "{ND-Root} ${((BT-03-notice == 'competition') and (BT-02-notice in (competition))) or not(BT-03-notice == 'competition')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0105"
-      }, {
-        "value" : "{ND-Root} ${((BT-03-notice == 'cont-modif') and (BT-02-notice in (cont-modif))) or not(BT-03-notice == 'cont-modif')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0106"
-      }, {
-        "value" : "{ND-Root} ${((BT-03-notice == 'dir-awa-pre') and (BT-02-notice in (dir-awa-pre))) or not(BT-03-notice == 'dir-awa-pre')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0107"
-      }, {
-        "value" : "{ND-Root} ${((BT-03-notice == 'planning') and (BT-02-notice in (planning))) or not(BT-03-notice == 'planning')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0108"
-      }, {
-        "value" : "{ND-Root} ${((BT-03-notice == 'result') and (BT-02-notice in (result))) or not(BT-03-notice == 'result')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00002-0109"
-      } ]
     }
   }, {
-    "id" : "BT-03-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Form Type",
-    "btId" : "BT-03",
-    "xpathAbsolute" : "/*/cbc:NoticeTypeCode/@listName",
-    "xpathRelative" : "cbc:NoticeTypeCode/@listName",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-27-Procedure",
+    "parentNodeId" : "ND-ProcedureValueEstimate",
+    "name" : "Estimated Value",
+    "btId" : "BT-27",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount",
+    "xpathRelative" : "cbc:EstimatedOverallContractAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "15", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-27-Procedure-Currency",
+    "parentNodeId" : "ND-ProcedureValueEstimate",
+    "name" : "Estimated Value Currency",
+    "btId" : "BT-27",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount/@currencyID",
+    "xpathRelative" : "cbc:EstimatedOverallContractAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-27-Procedure",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "form-type",
+        "id" : "eforms-currency",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-04-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Procedure Identifier",
-    "btId" : "BT-04",
-    "xpathAbsolute" : "/*/cbc:ContractFolderID",
-    "xpathRelative" : "cbc:ContractFolderID",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-271-Lot",
+    "parentNodeId" : "ND-LotValueEstimateExtension",
+    "name" : "Framework Maximum Value",
+    "btId" : "BT-271",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:FrameworkMaximumAmount",
+    "xpathRelative" : "efbc:FrameworkMaximumAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1097,96 +5272,142 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T02" ],
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "16", "17", "18", "20", "21", "22", "29", "30", "31", "33", "34" ],
+        "condition" : "{ND-LotProcurementScope} ${(BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')) or (BT-765-Lot is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-271-Lot-Currency",
+    "parentNodeId" : "ND-LotValueEstimateExtension",
+    "name" : "Framework Maximum Value Currency",
+    "btId" : "BT-271",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:FrameworkMaximumAmount/@currencyID",
+    "xpathRelative" : "efbc:FrameworkMaximumAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-271-Lot",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$",
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-currency",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-05(a)-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Dispatch Date",
-    "btId" : "BT-05",
-    "xpathAbsolute" : "/*/cbc:IssueDate",
-    "xpathRelative" : "cbc:IssueDate",
-    "type" : "date",
-    "presetValue" : "{NOW}",
-    "legalType" : "DATE",
+    "id" : "BT-271-Procedure",
+    "parentNodeId" : "ND-ProcedureValueEstimateExtension",
+    "name" : "Framework Maximum Value",
+    "btId" : "BT-271",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:FrameworkMaximumAmount",
+    "xpathRelative" : "efbc:FrameworkMaximumAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "16", "17", "18", "20", "21", "22", "29", "30", "31", "33", "34" ],
+        "condition" : "{ND-ProcedureProcurementScope} ${(BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')) or (BT-765-Lot is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    }
+  }, {
+    "id" : "BT-271-Procedure-Currency",
+    "parentNodeId" : "ND-ProcedureValueEstimateExtension",
+    "name" : "Framework Maximum Value Currency",
+    "btId" : "BT-271",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:FrameworkMaximumAmount/@currencyID",
+    "xpathRelative" : "efbc:FrameworkMaximumAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-271-Procedure",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-Root} ${(BT-05(a)-notice < BT-738-notice) or not(BT-738-notice is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00005-0150"
-      } ]
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-currency",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-05(b)-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Dispatch Time",
-    "btId" : "BT-05",
-    "xpathAbsolute" : "/*/cbc:IssueTime",
-    "xpathRelative" : "cbc:IssueTime",
-    "type" : "time",
-    "presetValue" : "{NOW}",
-    "legalType" : "DATE",
+    "id" : "BT-300-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Additional Information",
+    "btId" : "BT-300",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:Note",
+    "xpathRelative" : "cbc:Note",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 10000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-300-Lot-Language",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Additional Information Language",
+    "btId" : "BT-300",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:Note/@languageID",
+    "xpathRelative" : "cbc:Note/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-300-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-06-Lot",
-    "parentNodeId" : "ND-StrategicProcurementType",
-    "name" : "Strategic Procurement",
-    "btId" : "BT-06",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode[@listName='strategic-procurement']",
-    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='strategic-procurement']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-300-Part",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Additional Information",
+    "btId" : "BT-300",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Note",
+    "xpathRelative" : "cbc:Note",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 10000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1195,35 +5416,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-300-Part-Language",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Additional Information Language",
+    "btId" : "BT-300",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Note/@languageID",
+    "xpathRelative" : "cbc:Note/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-300-Part",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "strategic-procurement",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-09(a)-Procedure",
-    "parentNodeId" : "ND-CrossBorderLaw",
-    "name" : "Cross Border Law",
-    "btId" : "BT-09",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/cbc:ID[text()='CrossBorderLaw']",
-    "xpathRelative" : "cbc:ID[text()='CrossBorderLaw']",
-    "type" : "id",
-    "presetValue" : "CrossBorderLaw",
+    "id" : "BT-300-Procedure",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Additional Information",
+    "btId" : "BT-300",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Note",
+    "xpathRelative" : "cbc:Note",
+    "type" : "text-multilingual",
     "legalType" : "TEXT",
-    "privacy" : {
-      "code" : "cro-bor-law",
-      "unpublishedFieldId" : "BT-195(BT-09)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-09)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-09)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-09)-Procedure"
-    },
+    "maxLength" : 10000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1232,32 +5461,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "38", "39", "40", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^CrossBorderLaw$",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-09(b)-Procedure",
-    "parentNodeId" : "ND-CrossBorderLaw",
-    "name" : "Cross Border Law Description",
-    "btId" : "BT-09",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/cbc:DocumentDescription",
-    "xpathRelative" : "cbc:DocumentDescription",
-    "type" : "text-multilingual",
+    "id" : "BT-300-Procedure-Language",
+    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "name" : "Additional Information Language",
+    "btId" : "BT-300",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Note/@languageID",
+    "xpathRelative" : "cbc:Note/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-300-Procedure",
     "legalType" : "TEXT",
-    "maxLength" : 1000,
-    "privacy" : {
-      "code" : "cro-bor-law",
-      "unpublishedFieldId" : "BT-195(BT-09)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-09)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-09)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-09)-Procedure"
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-31-Procedure",
+    "parentNodeId" : "ND-LotDistribution",
+    "name" : "Lots Max Allowed",
+    "btId" : "BT-31",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric",
+    "xpathRelative" : "cbc:MaximumLotsSubmittedNumeric",
+    "type" : "integer",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1266,20 +5505,30 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "38", "39", "40", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotDistribution} ${BT-31-Procedure is present}",
+        "value" : "{ND-LotDistribution} ${BT-31-Procedure <= count(BT-137-Lot)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00031-0100"
+      } ]
     }
   }, {
-    "id" : "BT-10-Procedure-Buyer",
-    "parentNodeId" : "ND-ContractingParty",
-    "name" : "Activity Authority",
-    "btId" : "BT-10",
-    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingActivity/cbc:ActivityTypeCode[@listName='authority-activity']",
-    "xpathRelative" : "cac:ContractingActivity/cbc:ActivityTypeCode[@listName='authority-activity']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-3201-Tender",
+    "parentNodeId" : "ND-LotTender",
+    "name" : "Tender Identifier",
+    "btId" : "BT-3201",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:TenderReference/cbc:ID",
+    "xpathRelative" : "efac:TenderReference/cbc:ID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1288,43 +5537,34 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "22", "38", "39", "40", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "4", "7", "10", "16", "23", "29", "36", "CEI" ],
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-LotTender} ${OPT-321-Tender is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "authority-activity",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-105-Procedure",
-    "parentNodeId" : "ND-ProcedureTenderingProcess",
-    "name" : "Procedure Type",
-    "btId" : "BT-105",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:ProcedureCode",
-    "xpathRelative" : "cbc:ProcedureCode",
-    "type" : "code",
-    "legalType" : "CODE",
-    "privacy" : {
-      "code" : "pro-typ",
-      "unpublishedFieldId" : "BT-195(BT-105)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-105)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-105)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-105)-Procedure"
-    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-3202-Contract",
+    "parentNodeId" : "ND-SettledContractTenderReference",
+    "name" : "Contract Tender ID (Reference)",
+    "btId" : "BT-3202",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id-ref",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1333,7 +5573,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "38", "39", "40", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T02" ],
+        "condition" : "{ND-SettledContract} ${(OPT-316-Contract is not present) or (OPT-321-Tender is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -1342,90 +5587,50 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "10", "11", "16", "17", "18", "23", "24", "25", "26", "27", "28", "29", "30", "31", "36", "37", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "procurement-procedure-type",
-        "type" : "flat"
-      },
+    "pattern" : {
+      "value" : "^TEN-\\d{4}$",
       "severity" : "ERROR"
     },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice == '7' and BT-105-Procedure in ('open','restricted')) or OPP-070-notice != '7' or not(BT-105-Procedure is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0100"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice == '8' and BT-105-Procedure == 'open') or OPP-070-notice != '8' or not(BT-105-Procedure is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0101"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('12','13') and BT-105-Procedure in ('restricted','neg-w-call','comp-dial','innovation','oth-single','oth-mult')) or not(OPP-070-notice in ('12','13')) or not(BT-105-Procedure is present) }",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0103"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','E3') and BT-105-Procedure != 'neg-wo-call') or not(OPP-070-notice in ('10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','E3')) or not(BT-105-Procedure is present) }",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0104"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('9','18','22','27','31') and not(BT-105-Procedure in ('open','innovation','oth-single','oth-mult'))) or not(OPP-070-notice in ('9','18','22','27','31')) or not(BT-105-Procedure is present) }",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0105"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('23','24') and BT-105-Procedure in ('open','restricted','oth-single','oth-mult')) or not(OPP-070-notice in ('23','24'))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0106"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('36','37') and BT-105-Procedure in ('open','restricted','oth-single','oth-mult')) or not(OPP-070-notice in ('36','37'))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0107"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('32','35') and BT-105-Procedure in ('neg-wo-call','oth-single','oth-mult')) or not(OPP-070-notice in ('32','35')) or not(BT-105-Procedure is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0108"
-      }, {
-        "value" : "{ND-ProcedureTenderingProcess} ${(OPP-070-notice in ('25','26','27','28') and BT-105-Procedure == 'neg-wo-call') or not(OPP-070-notice in ('25','26','27','28')) or not(BT-105-Procedure is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0109"
-      }, {
-        "condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-105-Procedure is present)}",
-        "value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('open', 'restricted', 'neg-w-call')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0110"
-      }, {
-        "condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('3','6','9','18','22','27','31')) and (BT-105-Procedure is present)}",
-        "value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure in ('restricted', 'neg-w-call')}",
+        "condition" : "{ND-SettledContract} ${BT-3202-Contract is present}",
+        "value" : "{ND-SettledContract} ${every text:$tender in BT-3202-Contract satisfies ($tender in /OPT-321-Tender)}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0111"
-      }, {
-        "condition" : "{ND-ProcedureTenderingProcess} ${(BT-106-Procedure == 'true') and (OPP-070-notice in ('2','5','8','11','13','15','17','21','24','26','30','34','37','39')) and (BT-105-Procedure is present)}",
-        "value" : "{ND-ProcedureTenderingProcess} ${BT-105-Procedure == 'open'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00105-0112"
+        "message" : "rule|text|BR-BT-03202-0100"
       } ]
     }
   }, {
-    "id" : "BT-106-Procedure",
-    "parentNodeId" : "ND-AcceleratedProcedure",
-    "name" : "Procedure Accelerated",
-    "btId" : "BT-106",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReasonCode[@listName='accelerated-procedure']",
-    "xpathRelative" : "cbc:ProcessReasonCode[@listName='accelerated-procedure']",
-    "type" : "code",
-    "legalType" : "INDICATOR",
-    "privacy" : {
-      "code" : "pro-acc",
-      "unpublishedFieldId" : "BT-195(BT-106)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-106)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-106)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-106)-Procedure"
-    },
+    "id" : "BT-3202-Contract-Scheme",
+    "parentNodeId" : "ND-SettledContractTenderReference",
+    "name" : "Contract Tender ID (Reference) Schemename",
+    "btId" : "BT-3202",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender/cbc:ID/@schemeName",
+    "xpathRelative" : "cbc:ID/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-3202-Contract",
+    "presetValue" : "tender",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-33-Procedure",
+    "parentNodeId" : "ND-LotDistribution",
+    "name" : "Lots Max Awarded",
+    "btId" : "BT-33",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cbc:MaximumLotsAwardedNumeric",
+    "xpathRelative" : "cbc:MaximumLotsAwardedNumeric",
+    "type" : "integer",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1434,28 +5639,30 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "accelerated-procedure",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotDistribution} ${(BT-33-Procedure is present) and (BT-31-Procedure is present)}",
+        "value" : "{ND-LotDistribution} ${BT-33-Procedure <= BT-31-Procedure}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00033-0100"
+      } ]
     }
   }, {
-    "id" : "BT-109-Lot",
-    "parentNodeId" : "ND-FA",
-    "name" : "Framework Duration Justification",
-    "btId" : "BT-109",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification",
-    "xpathRelative" : "cbc:Justification",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-330-Procedure",
+    "parentNodeId" : "ND-GroupComposition",
+    "name" : "Group Identifier",
+    "btId" : "BT-330",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cbc:LotsGroupID",
+    "xpathRelative" : "cbc:LotsGroupID",
+    "type" : "id-ref",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1464,20 +5671,50 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^GLO-\\d{4}$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-LotDistribution} ${BT-330-Procedure is present}",
+        "value" : "{ND-LotDistribution} ${every text:$group in BT-330-Procedure satisfies ($group in /BT-137-LotsGroup)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00330-0100"
+      } ]
     }
   }, {
-    "id" : "BT-11-Procedure-Buyer",
-    "parentNodeId" : "ND-ContractingParty",
-    "name" : "Buyer Legal Type",
-    "btId" : "BT-11",
-    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']",
-    "xpathRelative" : "cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-legal-type']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-330-Procedure-Scheme",
+    "parentNodeId" : "ND-GroupComposition",
+    "name" : "Group Identifier Schemename",
+    "btId" : "BT-330",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cbc:LotsGroupID/@schemeName",
+    "xpathRelative" : "cbc:LotsGroupID/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-330-Procedure",
+    "presetValue" : "LotsGroup",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-36-Lot",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Duration Period",
+    "btId" : "BT-36",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
+    "xpathRelative" : "cbc:DurationMeasure",
+    "type" : "measure",
+    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1486,7 +5723,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "38", "39", "40", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "38", "39", "40", "T01", "T02" ],
+        "condition" : "{ND-LotDuration} ${(BT-537-Lot is present) or (BT-538-Lot is present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -1495,73 +5737,52 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "4", "7", "10", "14", "16", "19", "23", "29", "32", "35", "36", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "15", "16", "17", "18", "19", "22", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-buyer-legal-type",
-        "type" : "flat",
-        "parentId" : "buyer-legal-type"
-      },
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-111-Lot",
-    "parentNodeId" : "ND-FABuyerCategories",
-    "name" : "Framework Buyer Categories",
-    "btId" : "BT-111",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
+        "condition" : "{ND-LotDuration} ${(BT-71-Lot == 'res-pub-ser') and (BT-36-Lot is present)}",
+        "value" : "{ND-LotDuration} ${(BT-36-Lot > P0D) and (BT-36-Lot <= P3Y)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00036-0150"
       } ]
     }
   }, {
-    "id" : "BT-113-Lot",
-    "parentNodeId" : "ND-FA",
-    "name" : "Framework Maximum Participants Number",
-    "btId" : "BT-113",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:MaximumOperatorQuantity",
-    "xpathRelative" : "cbc:MaximumOperatorQuantity",
-    "type" : "integer",
-    "legalType" : "NUMBER",
+    "id" : "BT-36-Lot-Unit",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Duration Period Unit",
+    "btId" : "BT-36",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure/@unitCode",
+    "xpathRelative" : "cbc:DurationMeasure/@unitCode",
+    "type" : "code",
+    "attributeName" : "unitCode",
+    "attributeOf" : "BT-36-Lot",
+    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+    "codeList" : {
+      "value" : {
+        "id" : "duration-unit",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-115-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "GPA Coverage",
-    "btId" : "BT-115",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:GovernmentAgreementConstraintIndicator",
-    "xpathRelative" : "cbc:GovernmentAgreementConstraintIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-36-Part",
+    "parentNodeId" : "ND-PartDuration",
+    "name" : "Duration Period",
+    "btId" : "BT-36",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
+    "xpathRelative" : "cbc:DurationMeasure",
+    "type" : "measure",
+    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1570,16 +5791,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "9", "12", "13", "14", "18", "20", "21", "22", "23", "24", "27", "31", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "10", "11", "15", "16", "17", "25", "26", "29", "30" ],
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartDuration} ${BT-537-Part is present or BT-538-Part is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -1588,19 +5805,41 @@
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "condition" : "{ND-LotTenderingProcess} ${OPP-070-notice in ('14','19','28','32','35','40') and (BT-115-Lot is present) and (BT-23-Lot == 'services')}",
-        "value" : "{ND-LotTenderingProcess} ${BT-115-Lot == FALSE}",
+        "condition" : "{ND-PartDuration} ${(BT-71-Part == 'res-pub-ser') and (BT-36-Part is present)}",
+        "value" : "{ND-PartDuration} ${(BT-36-Part > P0D) and (BT-36-Part <= P3Y)}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00115-0150"
+        "message" : "rule|text|BR-BT-00036-0151"
       } ]
     }
   }, {
-    "id" : "BT-115-Part",
-    "parentNodeId" : "ND-PartTenderingProcess",
-    "name" : "GPA Coverage",
-    "btId" : "BT-115",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cbc:GovernmentAgreementConstraintIndicator",
-    "xpathRelative" : "cbc:GovernmentAgreementConstraintIndicator",
+    "id" : "BT-36-Part-Unit",
+    "parentNodeId" : "ND-PartDuration",
+    "name" : "Duration Period Unit",
+    "btId" : "BT-36",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure/@unitCode",
+    "xpathRelative" : "cbc:DurationMeasure/@unitCode",
+    "type" : "code",
+    "attributeName" : "unitCode",
+    "attributeOf" : "BT-36-Part",
+    "legalType" : "DURATION",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "duration-unit",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-40-Lot",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Second Stage Invite",
+    "btId" : "BT-40",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efbc:SecondStageIndicator",
+    "xpathRelative" : "efbc:SecondStageIndicator",
     "type" : "indicator",
     "legalType" : "INDICATOR",
     "repeatable" : {
@@ -1611,18 +5850,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-120-Lot",
+    "id" : "BT-41-Lot",
     "parentNodeId" : "ND-AwardingTerms",
-    "name" : "No Negotiation Necessary",
-    "btId" : "BT-120",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cbc:NoFurtherNegotiationIndicator",
-    "xpathRelative" : "cbc:NoFurtherNegotiationIndicator",
+    "name" : "Following Contract",
+    "btId" : "BT-41",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cbc:FollowupContractIndicator",
+    "xpathRelative" : "cbc:FollowupContractIndicator",
     "type" : "indicator",
     "legalType" : "INDICATOR",
     "repeatable" : {
@@ -1633,44 +5879,36 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "17", "18", "19", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-122-Lot",
-    "parentNodeId" : "ND-AuctionTerms",
-    "name" : "Electronic Auction Description",
-    "btId" : "BT-122",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "23", "24" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-123-Lot",
-    "parentNodeId" : "ND-AuctionTerms",
-    "name" : "Electronic Auction URL",
-    "btId" : "BT-123",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms/cbc:AuctionURI",
-    "xpathRelative" : "cbc:AuctionURI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-42-Lot",
+    "parentNodeId" : "ND-AwardingTerms",
+    "name" : "Jury Decision Binding",
+    "btId" : "BT-42",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cbc:BindingOnBuyerIndicator",
+    "xpathRelative" : "cbc:BindingOnBuyerIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1679,52 +5917,36 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-124-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "Tool Atypical URL",
-    "btId" : "BT-124",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:AccessToolsURI",
-    "xpathRelative" : "cbc:AccessToolsURI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "23", "24" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-124-Part",
-    "parentNodeId" : "ND-PartTenderingProcess",
-    "name" : "Tool Atypical URL",
-    "btId" : "BT-124",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cbc:AccessToolsURI",
-    "xpathRelative" : "cbc:AccessToolsURI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-44-Lot",
+    "parentNodeId" : "ND-Prize",
+    "name" : "Prize Rank",
+    "btId" : "BT-44",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:RankCode",
+    "xpathRelative" : "cbc:RankCode",
+    "type" : "integer",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1733,24 +5955,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-125(i)-Lot",
-    "parentNodeId" : "ND-LotPreviousPlanning",
-    "name" : "Previous Planning Identifier",
-    "btId" : "BT-125",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID",
-    "xpathRelative" : "cbc:ID",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-45-Lot",
+    "parentNodeId" : "ND-Prize",
+    "name" : "Rewards Other",
+    "btId" : "BT-45",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1759,51 +5978,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|[1-9](\\d{0,7})-(19|20)\\d\\d)$",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-125(i)-Part",
-    "parentNodeId" : "ND-PartPreviousPlanning",
-    "name" : "Previous Planning Identifier",
-    "btId" : "BT-125",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID",
-    "xpathRelative" : "cbc:ID",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-45-Lot-Language",
+    "parentNodeId" : "ND-Prize",
+    "name" : "Rewards Other Language",
+    "btId" : "BT-45",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-45-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "pattern" : {
-      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|[1-9](\\d{0,7})-(19|20)\\d\\d)$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-1251-Lot",
-    "parentNodeId" : "ND-LotPreviousPlanning",
-    "name" : "Previous Planning Part Identifier",
-    "btId" : "BT-1251",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ReferencedDocumentInternalAddress",
-    "xpathRelative" : "cbc:ReferencedDocumentInternalAddress",
+    "id" : "BT-46-Lot",
+    "parentNodeId" : "ND-AwardingTermsJuryMember",
+    "name" : "Jury Member Name",
+    "btId" : "BT-46",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:TechnicalCommitteePerson/cbc:FamilyName",
+    "xpathRelative" : "cbc:FamilyName",
     "type" : "text",
-    "legalType" : "IDENTIFIER",
-    "maxLength" : 30,
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1812,21 +6023,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-1251-Part",
-    "parentNodeId" : "ND-PartPreviousPlanning",
-    "name" : "Previous Planning Part Identifier",
-    "btId" : "BT-1251",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ReferencedDocumentInternalAddress",
-    "xpathRelative" : "cbc:ReferencedDocumentInternalAddress",
+    "id" : "BT-47-Lot",
+    "parentNodeId" : "ND-PreselectedParticipant",
+    "name" : "Participant Name",
+    "btId" : "BT-47",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList/cac:PreSelectedParty/cac:PartyName/cbc:Name",
+    "xpathRelative" : "cac:PartyName/cbc:Name",
     "type" : "text",
-    "legalType" : "IDENTIFIER",
-    "maxLength" : 30,
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1835,27 +6046,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-1252-Procedure",
-    "parentNodeId" : "ND-DirectAward",
-    "name" : "Direct Award Justification Previous Procedure Identifier",
-    "btId" : "BT-1252",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text",
-    "legalType" : "IDENTIFIER",
-    "privacy" : {
-      "code" : "dir-awa-pre",
-      "unpublishedFieldId" : "BT-195(BT-1252)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-1252)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-1252)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-1252)-Procedure"
-    },
+    "id" : "BT-50-Lot",
+    "parentNodeId" : "ND-SecondStage",
+    "name" : "Minimum Candidates",
+    "btId" : "BT-50",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList/cbc:MinimumQuantity",
+    "xpathRelative" : "cbc:MinimumQuantity",
+    "type" : "integer",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1864,24 +6068,46 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$",
-      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-SecondStage} ${(BT-50-Lot <= BT-51-Lot) or not(BT-51-Lot is present)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00050-0100"
+      }, {
+        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'restricted') and (BT-50-Lot > 4)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'restricted')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00050-0101"
+      }, {
+        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'neg-w-call') and (BT-50-Lot > 2)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'neg-w-call')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00050-0102"
+      }, {
+        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'comp-dial') and (BT-50-Lot > 2)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'comp-dial')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00050-0103"
+      }, {
+        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'innovation') and (BT-50-Lot > 2)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'innovation')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00050-0104"
+      } ]
     }
   }, {
-    "id" : "BT-127-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Future Notice",
-    "btId" : "BT-127",
-    "xpathAbsolute" : "/*/cbc:PlannedDate",
-    "xpathRelative" : "cbc:PlannedDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-500-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Name",
+    "btId" : "BT-500",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyName/cbc:Name",
+    "xpathRelative" : "cac:PartyName/cbc:Name",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1890,7 +6116,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -1899,33 +6125,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "4", "6" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    }
+  }, {
+    "id" : "BT-500-Organization-Company-Language",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Name Language",
+    "btId" : "BT-500",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyName/cbc:Name/@languageID",
+    "xpathRelative" : "cac:PartyName/cbc:Name/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-500-Organization-Company",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-Root} ${(BT-127-notice > BT-05(a)-notice) or not(BT-127-notice is present) or not(BT-05(a)-notice is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00127-0100"
-      } ]
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-13(d)-Lot",
-    "parentNodeId" : "ND-LotInfoRequestPeriod",
-    "name" : "Additional Information Deadline",
-    "btId" : "BT-13",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-500-Organization-TouchPoint",
+    "parentNodeId" : "ND-Touchpoint",
+    "name" : "Name",
+    "btId" : "BT-500",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PartyName/cbc:Name",
+    "xpathRelative" : "cac:PartyName/cbc:Name",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1934,24 +6170,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-500-Organization-TouchPoint-Language",
+    "parentNodeId" : "ND-Touchpoint",
+    "name" : "Name Language",
+    "btId" : "BT-500",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PartyName/cbc:Name/@languageID",
+    "xpathRelative" : "cac:PartyName/cbc:Name/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-500-Organization-TouchPoint",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-13(d)-Part",
-    "parentNodeId" : "ND-PartInfoRequestPeriod",
-    "name" : "Additional Information Deadline",
-    "btId" : "BT-13",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-500-UBO",
+    "parentNodeId" : "ND-UBO",
+    "name" : "UBO Name",
+    "btId" : "BT-500",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cbc:FamilyName",
+    "xpathRelative" : "cbc:FamilyName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1960,24 +6215,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-13(t)-Lot",
-    "parentNodeId" : "ND-LotInfoRequestPeriod",
-    "name" : "Additional Information Deadline",
-    "btId" : "BT-13",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndTime",
-    "xpathRelative" : "cbc:EndTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "BT-501-Organization-Company",
+    "parentNodeId" : "ND-CompanyLegalEntity",
+    "name" : "Organisation Identifier",
+    "btId" : "BT-501",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity/cbc:CompanyID",
+    "xpathRelative" : "cbc:CompanyID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -1986,24 +6237,29 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "4", "5", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "23", "24", "29", "30", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
     }
   }, {
-    "id" : "BT-13(t)-Part",
-    "parentNodeId" : "ND-PartInfoRequestPeriod",
-    "name" : "Additional Information Deadline",
-    "btId" : "BT-13",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod/cbc:EndTime",
-    "xpathRelative" : "cbc:EndTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "BT-5010-Lot",
+    "parentNodeId" : "ND-Funding",
+    "name" : "EU Funds Financing Identifier",
+    "btId" : "BT-5010",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Funding/efbc:FinancingIdentifier",
+    "xpathRelative" : "efbc:FinancingIdentifier",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2012,24 +6268,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-130-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "Dispatch Invitation Tender",
-    "btId" : "BT-130",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:InvitationSubmissionPeriod/cbc:StartDate",
-    "xpathRelative" : "cac:InvitationSubmissionPeriod/cbc:StartDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-5011-Contract",
+    "parentNodeId" : "ND-ContractEUFunds",
+    "name" : "Contract EU Funds Financing Identifier",
+    "btId" : "BT-5011",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding/efbc:FinancingIdentifier",
+    "xpathRelative" : "efbc:FinancingIdentifier",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2038,33 +6290,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-LotTenderingProcess} ${(BT-631-Lot < BT-130-Lot) or not(BT-631-Lot is present) or not(BT-130-Lot is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00130-0100"
-      } ]
     }
   }, {
-    "id" : "BT-131(d)-Lot",
-    "parentNodeId" : "ND-SubmissionDeadline",
-    "name" : "Deadline Receipt Tenders",
-    "btId" : "BT-131",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-502-Organization-Company",
+    "parentNodeId" : "ND-CompanyContact",
+    "name" : "Organisation Contact Point",
+    "btId" : "BT-502",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:Name",
+    "xpathRelative" : "cbc:Name",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2073,48 +6313,44 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-502-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointContact",
+    "name" : "Contact Point",
+    "btId" : "BT-502",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:Name",
+    "xpathRelative" : "cbc:Name",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "8" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-LotTenderingProcess} ${(BT-131(d)-Lot is present) and (BT-13(d)-Lot is present)}",
-        "value" : "{ND-LotTenderingProcess} ${BT-13(d)-Lot <= BT-131(d)-Lot}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00131-0150"
-      }, {
-        "condition" : "{ND-LotTenderingProcess} ${(BT-131(d)-Lot is present) and (BT-05(a)-notice is present)}",
-        "value" : "{ND-LotTenderingProcess} ${BT-131(d)-Lot > BT-05(a)-notice}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00131-0151"
-      } ]
     }
   }, {
-    "id" : "BT-131(t)-Lot",
-    "parentNodeId" : "ND-SubmissionDeadline",
-    "name" : "Deadline Receipt Tenders",
-    "btId" : "BT-131",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod/cbc:EndTime",
-    "xpathRelative" : "cbc:EndTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "BT-503-Organization-Company",
+    "parentNodeId" : "ND-CompanyContact",
+    "name" : "Organisation Contact Telephone Number",
+    "btId" : "BT-503",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:Telephone",
+    "xpathRelative" : "cbc:Telephone",
+    "type" : "phone",
+    "legalType" : "TEXT",
+    "maxLength" : 30,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2123,7 +6359,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -2132,24 +6368,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "8" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-1311(d)-Lot",
-    "parentNodeId" : "ND-ParticipationRequestPeriod",
-    "name" : "Deadline Receipt Requests",
-    "btId" : "BT-1311",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-503-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointContact",
+    "name" : "Contact Telephone Number",
+    "btId" : "BT-503",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:Telephone",
+    "xpathRelative" : "cbc:Telephone",
+    "type" : "phone",
+    "legalType" : "TEXT",
+    "maxLength" : 30,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2158,44 +6395,52 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "8", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-503-UBO",
+    "parentNodeId" : "ND-UBOContact",
+    "name" : "UBO Telephone Number",
+    "btId" : "BT-503",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact/cbc:Telephone",
+    "xpathRelative" : "cbc:Telephone",
+    "type" : "phone",
+    "legalType" : "TEXT",
+    "maxLength" : 30,
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
+    "forbidden" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "condition" : "{ND-LotTenderingProcess} ${(BT-766-Lot in ('dps-list', 'dps-nlist')) and (BT-537-Lot is present) and (BT-1311(d)-Lot is present) }",
-        "value" : "{ND-LotTenderingProcess} ${BT-1311(d)-Lot == BT-537-Lot}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-01311-0150"
-      }, {
-        "condition" : "{ND-LotTenderingProcess} ${(BT-1311(d)-Lot is present) and (BT-130-Lot is present)}",
-        "value" : "{ND-LotTenderingProcess} ${(BT-1311(d)-Lot < BT-130-Lot)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-01311-0152"
-      }, {
-        "condition" : "{ND-LotTenderingProcess} ${(BT-1311(d)-Lot is present) and (BT-13(d)-Lot is present)}",
-        "value" : "{ND-LotTenderingProcess} ${BT-13(d)-Lot <= BT-1311(d)-Lot}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-01311-0153"
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-1311(t)-Lot",
-    "parentNodeId" : "ND-ParticipationRequestPeriod",
-    "name" : "Deadline Receipt Requests",
-    "btId" : "BT-1311",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod/cbc:EndTime",
-    "xpathRelative" : "cbc:EndTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "BT-505-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Internet Address",
+    "btId" : "BT-505",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cbc:WebsiteURI",
+    "xpathRelative" : "cbc:WebsiteURI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2204,24 +6449,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "8", "10", "11", "12", "13", "14", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-132(d)-Lot",
-    "parentNodeId" : "ND-PublicOpening",
-    "name" : "Public Opening Date",
-    "btId" : "BT-132",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cbc:OccurrenceDate",
-    "xpathRelative" : "cbc:OccurrenceDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-505-Organization-TouchPoint",
+    "parentNodeId" : "ND-Touchpoint",
+    "name" : "Internet Address",
+    "btId" : "BT-505",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cbc:WebsiteURI",
+    "xpathRelative" : "cbc:WebsiteURI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2230,39 +6476,61 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-506-Organization-Company",
+    "parentNodeId" : "ND-CompanyContact",
+    "name" : "Organisation Contact Email Address",
+    "btId" : "BT-506",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:ElectronicMail",
+    "xpathRelative" : "cbc:ElectronicMail",
+    "type" : "email",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
+    "forbidden" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "condition" : "{ND-PublicOpening} ${(BT-132(d)-Lot is present) and (BT-1311(d)-Lot is present)}",
-        "value" : "{ND-PublicOpening} ${BT-132(d)-Lot > BT-1311(d)-Lot}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00132-0150"
-      }, {
-        "condition" : "{ND-PublicOpening} ${(BT-132(d)-Lot is present) and (BT-131(d)-Lot is present)}",
-        "value" : "{ND-PublicOpening} ${BT-132(d)-Lot >= BT-131(d)-Lot}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00132-0151"
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^[A-Za-z0-9!#$%&amp;''*+/=?_-]+(\\.[A-Za-z0-9!#$%&amp;''*+/=?_-]+)*@([A-Za-z0-9]([A-Za-z0-9_-]*[A-Za-z0-9])?\\.)+([A-Za-z]{2,})$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-132(t)-Lot",
-    "parentNodeId" : "ND-PublicOpening",
-    "name" : "Public Opening Date",
-    "btId" : "BT-132",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cbc:OccurrenceTime",
-    "xpathRelative" : "cbc:OccurrenceTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "BT-506-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointContact",
+    "name" : "Contact Email Address",
+    "btId" : "BT-506",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:ElectronicMail",
+    "xpathRelative" : "cbc:ElectronicMail",
+    "type" : "email",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2271,25 +6539,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "value" : "^[A-Za-z0-9!#$%&amp;''*+/=?_-]+(\\.[A-Za-z0-9!#$%&amp;''*+/=?_-]+)*@([A-Za-z0-9]([A-Za-z0-9_-]*[A-Za-z0-9])?\\.)+([A-Za-z]{2,})$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-133-Lot",
-    "parentNodeId" : "ND-PublicOpeningPlace",
-    "name" : "Public Opening Place",
-    "btId" : "BT-133",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cac:OccurenceLocation/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
+    "id" : "BT-506-UBO",
+    "parentNodeId" : "ND-UBOContact",
+    "name" : "UBO Email Address",
+    "btId" : "BT-506",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact/cbc:ElectronicMail",
+    "xpathRelative" : "cbc:ElectronicMail",
+    "type" : "email",
     "legalType" : "TEXT",
-    "maxLength" : 1000,
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2298,21 +6566,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^[A-Za-z0-9!#$%&amp;''*+/=?_-]+(\\.[A-Za-z0-9!#$%&amp;''*+/=?_-]+)*@([A-Za-z0-9]([A-Za-z0-9_-]*[A-Za-z0-9])?\\.)+([A-Za-z]{2,})$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-134-Lot",
-    "parentNodeId" : "ND-PublicOpening",
-    "name" : "Public Opening Description",
-    "btId" : "BT-134",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-507-Organization-Company",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Organisation Country Subdivision",
+    "btId" : "BT-507",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:CountrySubentityCode",
+    "xpathRelative" : "cbc:CountrySubentityCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2321,28 +6592,58 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Company} ${BT-514-Organization-Company not in (nuts-country)}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "nuts-lvl3",
+        "type" : "flat",
+        "parentId" : "nuts"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-135-Procedure",
-    "parentNodeId" : "ND-DirectAward",
-    "name" : "Direct Award Justification Text",
-    "btId" : "BT-135",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/cbc:ProcessReason",
-    "xpathRelative" : "cbc:ProcessReason",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "privacy" : {
-      "code" : "dir-awa-tex",
-      "unpublishedFieldId" : "BT-195(BT-135)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-135)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-135)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-135)-Procedure"
-    },
+    "id" : "BT-507-Organization-Company-List",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Organisation Country Subdivision Listname",
+    "btId" : "BT-507",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:CountrySubentityCode/@listName",
+    "xpathRelative" : "cbc:CountrySubentityCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-507-Organization-Company",
+    "presetValue" : "nuts",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-507-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "Country Subdivision",
+    "btId" : "BT-507",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:CountrySubentityCode",
+    "xpathRelative" : "cbc:CountrySubentityCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2351,57 +6652,58 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Touchpoint} ${BT-514-Organization-TouchPoint not in (nuts-country)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-1351-Procedure",
-    "parentNodeId" : "ND-AcceleratedProcedure",
-    "name" : "Procedure Accelerated Justification",
-    "btId" : "BT-1351",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/cbc:ProcessReason",
-    "xpathRelative" : "cbc:ProcessReason",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 4000,
-    "privacy" : {
-      "code" : "pro-acc-jus",
-      "unpublishedFieldId" : "BT-195(BT-1351)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-1351)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-1351)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-1351)-Procedure"
-    },
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "nuts-lvl3",
+        "type" : "flat",
+        "parentId" : "nuts"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-136-Procedure",
-    "parentNodeId" : "ND-DirectAward",
-    "name" : "Direct Award Justification Code",
-    "btId" : "BT-136",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/cbc:ProcessReasonCode",
-    "xpathRelative" : "cbc:ProcessReasonCode",
+    "id" : "BT-507-Organization-TouchPoint-List",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "Country Subdivision Listname",
+    "btId" : "BT-507",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:CountrySubentityCode/@listName",
+    "xpathRelative" : "cbc:CountrySubentityCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-507-Organization-TouchPoint",
+    "presetValue" : "nuts",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-507-UBO",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "Country Subdivision",
+    "btId" : "BT-507",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:CountrySubentityCode",
+    "xpathRelative" : "cbc:CountrySubentityCode",
     "type" : "code",
     "legalType" : "CODE",
-    "privacy" : {
-      "code" : "dir-awa-jus",
-      "unpublishedFieldId" : "BT-195(BT-136)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-136)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-136)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-136)-Procedure"
-    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2410,29 +6712,49 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "38", "39", "40", "CEI", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-UBO} ${not(BT-514-UBO in (nuts-country))}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "direct-award-justification",
-        "type" : "flat"
+        "id" : "nuts-lvl3",
+        "type" : "flat",
+        "parentId" : "nuts"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-137-Lot",
-    "parentNodeId" : "ND-Lot",
-    "name" : "Purpose Lot Identifier",
-    "btId" : "BT-137",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID",
-    "xpathRelative" : "cbc:ID",
-    "type" : "id",
-    "idScheme" : "LOT",
-    "schemeName" : "Lot",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-507-UBO-List",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "Country Subdivision Listname",
+    "btId" : "BT-507",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:CountrySubentityCode/@listName",
+    "xpathRelative" : "cbc:CountrySubentityCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-507-UBO",
+    "presetValue" : "nuts",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-5071-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Country Subdivision",
+    "btId" : "BT-5071",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode",
+    "xpathRelative" : "cbc:CountrySubentityCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2444,55 +6766,56 @@
         "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-727-Lot is present or BT-5141-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     },
     "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${(BT-727-Lot is not present) and BT-5141-Lot in (nuts-country)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^LOT-\\d{4}$",
+    "codeList" : {
+      "value" : {
+        "id" : "nuts-lvl3",
+        "type" : "flat",
+        "parentId" : "nuts"
+      },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-Lot} ${(OPP-070-notice in ('7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','E4') and (BT-747-Lot == 'sui-act') and (BT-747-Lot == 'ef-stand') and (BT-747-Lot == 'tp-abil')) or ((OPP-070-notice == 'E4') and not(BT-747-Lot == 'sui-act') and not(BT-747-Lot == 'ef-stand') and not(BT-747-Lot == 'tp-abil')) or (not(OPP-070-notice in ('7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','E4')))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0200"
-      }, {
-        "value" : "{ND-Lot} ${BT-137-Lot is unique in /BT-137-Lot}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0201"
-      }, {
-        "condition" : "{ND-Lot} ${(OPP-070-notice in ('E1','T01','7','8','9','10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28')) and (count(/BT-137-Lot) > 1)}",
-        "value" : "{ND-Lot} ${BT-137-Lot != 'LOT-0000'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0207"
-      }, {
-        "condition" : "{ND-Lot} ${(OPP-070-notice in ('25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5')) and BT-13713-LotResult is present}",
-        "value" : "{ND-Lot} ${(BT-137-Lot in BT-13713-LotResult)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0209"
-      } ]
     }
   }, {
-    "id" : "BT-137-Part",
-    "parentNodeId" : "ND-Part",
-    "name" : "Purpose Lot Identifier",
-    "btId" : "BT-137",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cbc:ID",
-    "xpathRelative" : "cbc:ID",
-    "type" : "id",
-    "idScheme" : "PAR",
-    "schemeName" : "Part",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-5071-Lot-List",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Country Subdivision Listname",
+    "btId" : "BT-5071",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode/@listName",
+    "xpathRelative" : "cbc:CountrySubentityCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-5071-Lot",
+    "presetValue" : "nuts",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-5071-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Country Subdivision",
+    "btId" : "BT-5071",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode",
+    "xpathRelative" : "cbc:CountrySubentityCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2504,6 +6827,11 @@
         "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-727-Part is present or BT-5141-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     },
     "mandatory" : {
@@ -2511,37 +6839,106 @@
       "severity" : "ERROR",
       "constraints" : [ {
         "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${(BT-727-Part is not present) and BT-5141-Part in (nuts-country)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^PAR-\\d{4}$",
+    "codeList" : {
+      "value" : {
+        "id" : "nuts-lvl3",
+        "type" : "flat",
+        "parentId" : "nuts"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-5071-Part-List",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Country Subdivision Listname",
+    "btId" : "BT-5071",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode/@listName",
+    "xpathRelative" : "cbc:CountrySubentityCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-5071-Part",
+    "presetValue" : "nuts",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-5071-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Country Subdivision",
+    "btId" : "BT-5071",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode",
+    "xpathRelative" : "cbc:CountrySubentityCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
+    "forbidden" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-Part} ${BT-137-Part is unique in /BT-137-Part}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0202"
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
       }, {
-        "condition" : "{ND-Part} ${(OPP-070-notice in ('4','5','6','E2')) and (count(/BT-137-Part) > 1)}",
-        "value" : "{ND-Part} ${BT-137-Part != 'PAR-0000'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00137-0208"
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-727-Procedure is present or BT-5141-Procedure is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${(BT-727-Procedure is not present) and BT-5141-Procedure in (nuts-country)}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "nuts-lvl3",
+        "type" : "flat",
+        "parentId" : "nuts"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-14-Lot",
-    "parentNodeId" : "ND-LotProcurementDocument",
-    "name" : "Documents Restricted",
-    "btId" : "BT-14",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentType",
-    "xpathRelative" : "cbc:DocumentType",
-    "type" : "code",
-    "legalType" : "INDICATOR",
+    "id" : "BT-5071-Procedure-List",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Country Subdivision Listname",
+    "btId" : "BT-5071",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode/@listName",
+    "xpathRelative" : "cbc:CountrySubentityCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-5071-Procedure",
+    "presetValue" : "nuts",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-508-Procedure-Buyer",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Buyer Profile URL",
+    "btId" : "BT-508",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cbc:BuyerProfileURI",
+    "xpathRelative" : "cbc:BuyerProfileURI",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2550,7 +6947,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "38", "39", "40", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -2559,27 +6956,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "16", "17", "19", "23", "24", "CEI" ],
+        "noticeTypes" : [ "1", "2", "3" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "document-distribution",
-        "type" : "flat"
-      },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-14-Part",
-    "parentNodeId" : "ND-PartProcurementDocument",
-    "name" : "Documents Restricted",
-    "btId" : "BT-14",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentType",
-    "xpathRelative" : "cbc:DocumentType",
-    "type" : "code",
-    "legalType" : "INDICATOR",
+    "id" : "BT-509-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation eDelivery Gateway",
+    "btId" : "BT-509",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cbc:EndpointID",
+    "xpathRelative" : "cbc:EndpointID",
+    "type" : "url",
+    "legalType" : "URL",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2588,25 +6983,22 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "document-distribution",
-        "type" : "flat"
-      },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-15-Lot",
-    "parentNodeId" : "ND-LotDocumentsReference",
-    "name" : "Documents URL",
-    "btId" : "BT-15",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference[not(cbc:DocumentType/text()='restricted-document')]/cac:Attachment/cac:ExternalReference/cbc:URI",
-    "xpathRelative" : "cac:Attachment/cac:ExternalReference/cbc:URI",
+    "id" : "BT-509-Organization-TouchPoint",
+    "parentNodeId" : "ND-Touchpoint",
+    "name" : "eDelivery Gateway",
+    "btId" : "BT-509",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cbc:EndpointID",
+    "xpathRelative" : "cbc:EndpointID",
     "type" : "url",
     "legalType" : "URL",
     "maxLength" : 400,
@@ -2618,25 +7010,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-15-Part",
-    "parentNodeId" : "ND-PartDocumentsReference",
-    "name" : "Documents URL",
-    "btId" : "BT-15",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference[not(cbc:DocumentType/text()='restricted-document')]/cac:Attachment/cac:ExternalReference/cbc:URI",
-    "xpathRelative" : "cac:Attachment/cac:ExternalReference/cbc:URI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-51-Lot",
+    "parentNodeId" : "ND-SecondStage",
+    "name" : "Maximum Candidates Number",
+    "btId" : "BT-51",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList/cbc:MaximumQuantity",
+    "xpathRelative" : "cbc:MaximumQuantity",
+    "type" : "integer",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2645,25 +7036,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-16-Organization-Company",
+    "id" : "BT-510(a)-Organization-Company",
     "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Organisation Part Name",
-    "btId" : "BT-16",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:Department",
-    "xpathRelative" : "cbc:Department",
+    "name" : "Street",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:StreetName",
+    "xpathRelative" : "cbc:StreetName",
     "type" : "text",
     "legalType" : "TEXT",
-    "maxLength" : 1000,
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2675,18 +7062,23 @@
         "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Company} ${BT-513-Organization-Company is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-16-Organization-TouchPoint",
+    "id" : "BT-510(a)-Organization-TouchPoint",
     "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "Part Name",
-    "btId" : "BT-16",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:Department",
-    "xpathRelative" : "cbc:Department",
+    "name" : "Street",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:StreetName",
+    "xpathRelative" : "cbc:StreetName",
     "type" : "text",
     "legalType" : "TEXT",
-    "maxLength" : 1000,
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2698,46 +7090,23 @@
         "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    }
-  }, {
-    "id" : "BT-165-Organization-Company",
-    "parentNodeId" : "ND-WinningParty",
-    "name" : "Winner Size",
-    "btId" : "BT-165",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company[(cac:PartyIdentification/cbc:ID/text() = //efac:TenderingParty/efac:Tenderer/cbc:ID/text()) or (cac:PartyIdentification/cbc:ID/text() = //efac:TenderingParty/efac:Subcontractor/cbc:ID/text())]/efbc:CompanySizeCode",
-    "xpathRelative" : "efbc:CompanySizeCode",
-    "type" : "code",
-    "legalType" : "CODE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Touchpoint} ${BT-513-Organization-TouchPoint is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "economic-operator-size",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-17-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "SubmissionElectronic",
-    "btId" : "BT-17",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:SubmissionMethodCode[@listName='esubmission']",
-    "xpathRelative" : "cbc:SubmissionMethodCode[@listName='esubmission']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-510(a)-UBO",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "Street",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:StreetName",
+    "xpathRelative" : "cbc:StreetName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2746,36 +7115,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "10", "11", "15", "16", "17", "23", "24", "CEI" ],
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-UBO} ${BT-500-UBO is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "esubmission",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-18-Lot",
-    "parentNodeId" : "ND-TenderRecipient",
-    "name" : "Submission URL",
-    "btId" : "BT-18",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty/cbc:EndpointID",
-    "xpathRelative" : "cbc:EndpointID",
-    "type" : "url",
-    "legalType" : "URL",
+    "id" : "BT-510(b)-Organization-Company",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Streetline 1",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:AdditionalStreetName",
+    "xpathRelative" : "cbc:AdditionalStreetName",
+    "type" : "text",
+    "legalType" : "TEXT",
     "maxLength" : 400,
     "repeatable" : {
       "value" : false,
@@ -2785,24 +7143,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Company} ${BT-510(a)-Organization-Company is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-19-Lot",
-    "parentNodeId" : "ND-NonEsubmission",
-    "name" : "Submission Nonelectronic Justification",
-    "btId" : "BT-19",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification/cbc:ProcessReasonCode[@listName='no-esubmission-justification']",
-    "xpathRelative" : "cbc:ProcessReasonCode[@listName='no-esubmission-justification']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-510(b)-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "Streetline 1",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:AdditionalStreetName",
+    "xpathRelative" : "cbc:AdditionalStreetName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2811,26 +7171,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Touchpoint} ${BT-510(a)-Organization-TouchPoint is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "no-esubmission-justification",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-21-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Title",
-    "btId" : "BT-21",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:Name",
-    "xpathRelative" : "cbc:Name",
-    "type" : "text-multilingual",
+    "id" : "BT-510(b)-UBO",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "Streetline 1",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:AdditionalStreetName",
+    "xpathRelative" : "cbc:AdditionalStreetName",
+    "type" : "text",
     "legalType" : "TEXT",
     "maxLength" : 400,
     "repeatable" : {
@@ -2841,28 +7199,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-UBO} ${BT-510(a)-UBO is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-21-Part",
-    "parentNodeId" : "ND-PartProcurementScope",
-    "name" : "Title",
-    "btId" : "BT-21",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Name",
-    "xpathRelative" : "cbc:Name",
-    "type" : "text-multilingual",
+    "id" : "BT-510(c)-Organization-Company",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Streetline 2",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cac:AddressLine/cbc:Line",
+    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "type" : "text",
     "legalType" : "TEXT",
     "maxLength" : 400,
     "repeatable" : {
@@ -2873,28 +7227,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "4", "5", "6" ],
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Company} ${BT-510(b)-Organization-Company is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-21-Procedure",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
-    "name" : "Title",
-    "btId" : "BT-21",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Name",
-    "xpathRelative" : "cbc:Name",
-    "type" : "text-multilingual",
+    "id" : "BT-510(c)-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "Streetline 2",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cac:AddressLine/cbc:Line",
+    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "type" : "text",
     "legalType" : "TEXT",
     "maxLength" : 400,
     "repeatable" : {
@@ -2908,26 +7258,23 @@
         "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Touchpoint} ${BT-510(b)-Organization-TouchPoint is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-22-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Internal Identifier",
-    "btId" : "BT-22",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:ID",
-    "xpathRelative" : "cbc:ID",
-    "type" : "id",
+    "id" : "BT-510(c)-UBO",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "Streetline 2",
+    "btId" : "BT-510",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cac:AddressLine/cbc:Line",
+    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "type" : "text",
     "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2936,20 +7283,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-UBO} ${BT-510(b)-UBO is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-22-Part",
-    "parentNodeId" : "ND-PartProcurementScope",
-    "name" : "Internal Identifier",
-    "btId" : "BT-22",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:ID",
-    "xpathRelative" : "cbc:ID",
-    "type" : "id",
+    "id" : "BT-5101(a)-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Street",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:StreetName",
+    "xpathRelative" : "cbc:StreetName",
+    "type" : "text",
     "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2958,20 +7311,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-5131-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-22-Procedure",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
-    "name" : "Internal Identifier",
-    "btId" : "BT-22",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:ID",
-    "xpathRelative" : "cbc:ID",
-    "type" : "id",
+    "id" : "BT-5101(a)-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Street",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:StreetName",
+    "xpathRelative" : "cbc:StreetName",
+    "type" : "text",
     "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -2980,20 +7339,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-5131-Part is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-23-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Main Nature",
-    "btId" : "BT-23",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:ProcurementTypeCode[@listName='contract-nature']",
-    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='contract-nature']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-5101(a)-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Street",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:StreetName",
+    "xpathRelative" : "cbc:StreetName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3002,52 +7367,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-5131-Procedure is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-contract-nature",
-        "type" : "flat",
-        "parentId" : "contract-nature"
-      },
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-LotProcurementScope} ${(OPP-070-notice in ('14','19','28','32','35','40')) and (BT-23-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${BT-23-Lot != 'supplies'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00023-0200"
-      }, {
-        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot is present) and (BT-531-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${not(BT-23-Lot in BT-531-Lot)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00023-0203"
-      } ]
     }
   }, {
-    "id" : "BT-23-Part",
-    "parentNodeId" : "ND-PartProcurementScope",
-    "name" : "Main Nature",
-    "btId" : "BT-23",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:ProcurementTypeCode[@listName='contract-nature']",
-    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='contract-nature']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-5101(b)-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Streetline 1",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:AdditionalStreetName",
+    "xpathRelative" : "cbc:AdditionalStreetName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3056,47 +7395,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "4", "5", "6" ],
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-5101(a)-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-contract-nature",
-        "type" : "flat",
-        "parentId" : "contract-nature"
-      },
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part is present) and (BT-531-Part is present)}",
-        "value" : "{ND-PartProcurementScope} ${not(BT-23-Part in BT-531-Part)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00023-0204"
-      } ]
     }
   }, {
-    "id" : "BT-23-Procedure",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
-    "name" : "Main Nature",
-    "btId" : "BT-23",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:ProcurementTypeCode",
-    "xpathRelative" : "cbc:ProcurementTypeCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-5101(b)-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Streetline 1",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:AdditionalStreetName",
+    "xpathRelative" : "cbc:AdditionalStreetName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3105,53 +7423,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-5101(a)-Part is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-contract-nature",
-        "type" : "flat",
-        "parentId" : "contract-nature"
-      },
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-ProcedureProcurementScope} ${(OPP-070-notice in ('14','19','28','32','35','40')) and (BT-23-Procedure is present)}",
-        "value" : "{ND-ProcedureProcurementScope} ${BT-23-Procedure != 'supplies'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00023-0201"
-      }, {
-        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure is present) and (BT-531-Procedure is present)}",
-        "value" : "{ND-ProcedureProcurementScope} ${BT-23-Procedure not in BT-531-Procedure}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00023-0202"
-      } ]
     }
   }, {
-    "id" : "BT-24-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Description",
-    "btId" : "BT-24",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
+    "id" : "BT-5101(b)-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Streetline 1",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:AdditionalStreetName",
+    "xpathRelative" : "cbc:AdditionalStreetName",
+    "type" : "text",
     "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3160,30 +7451,54 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-5101(a)-Procedure is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-5101(c)-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Streetline 2",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:AddressLine/cbc:Line",
+    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
         "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-5101(b)-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-24-Part",
-    "parentNodeId" : "ND-PartProcurementScope",
-    "name" : "Description",
-    "btId" : "BT-24",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
+    "id" : "BT-5101(c)-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Streetline 2",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:AddressLine/cbc:Line",
+    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "type" : "text",
     "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3195,27 +7510,51 @@
         "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-5101(b)-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-5101(c)-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Streetline 2",
+    "btId" : "BT-5101",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:AddressLine/cbc:Line",
+    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "4", "5", "6" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-5101(b)-Procedure is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-24-Procedure",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
-    "name" : "Description",
-    "btId" : "BT-24",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
+    "id" : "BT-512-Organization-Company",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Organisation Post Code",
+    "btId" : "BT-512",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:PostalZone",
+    "xpathRelative" : "cbc:PostalZone",
+    "type" : "text",
     "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3224,7 +7563,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Company} ${BT-514-Organization-Company not in (postcode-country)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -3233,20 +7577,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-25-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Quantity",
-    "btId" : "BT-25",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:EstimatedOverallContractQuantity",
-    "xpathRelative" : "cbc:EstimatedOverallContractQuantity",
-    "type" : "number",
-    "legalType" : "NUMBER",
+    "id" : "BT-512-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "Post Code",
+    "btId" : "BT-512",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:PostalZone",
+    "xpathRelative" : "cbc:PostalZone",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3255,49 +7600,35 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Touchpoint} ${BT-514-Organization-TouchPoint not in (postcode-country)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-26(a)-Lot",
-    "parentNodeId" : "ND-LotAdditionalClassification",
-    "name" : "Classification Type (e.g. CPV)",
-    "btId" : "BT-26",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode/@listName",
-    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
-    "type" : "code",
-    "legalType" : "CODE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "classification-type",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-26(a)-Part",
-    "parentNodeId" : "ND-PartAdditionalClassification",
-    "name" : "Classification Type (e.g. CPV)",
-    "btId" : "BT-26",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode/@listName",
-    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-512-UBO",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "Post Code",
+    "btId" : "BT-512",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:PostalZone",
+    "xpathRelative" : "cbc:PostalZone",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3306,27 +7637,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-UBO} ${not(BT-514-UBO in (postcode-country))}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "classification-type",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-26(a)-Procedure",
-    "parentNodeId" : "ND-ProcedureAdditionalCommodityClassification",
-    "name" : "Classification Type (e.g. CPV)",
-    "btId" : "BT-26",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode/@listName",
-    "xpathRelative" : "cbc:ItemClassificationCode/@listName",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-5121-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Post Code",
+    "btId" : "BT-5121",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:PostalZone",
+    "xpathRelative" : "cbc:PostalZone",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3335,27 +7665,36 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-5131-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "classification-type",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-5141-Lot in (postcode-country) and BT-5101(a)-Lot is present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
     }
   }, {
-    "id" : "BT-26(m)-Lot",
-    "parentNodeId" : "ND-LotMainClassificationCode",
-    "name" : "Classification Type (e.g. CPV)",
-    "btId" : "BT-26",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode/@listName",
-    "xpathRelative" : "@listName",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-5121-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Post Code",
+    "btId" : "BT-5121",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:PostalZone",
+    "xpathRelative" : "cbc:PostalZone",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3364,7 +7703,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-5131-Part is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -3373,27 +7717,22 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-5141-Part in (postcode-country) and BT-5101(a)-Part is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "classification-type",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-26(m)-Part",
-    "parentNodeId" : "ND-PartMainClassificationCode",
-    "name" : "Classification Type (e.g. CPV)",
-    "btId" : "BT-26",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode/@listName",
-    "xpathRelative" : "@listName",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-5121-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Post Code",
+    "btId" : "BT-5121",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:PostalZone",
+    "xpathRelative" : "cbc:PostalZone",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3402,7 +7741,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-5131-Procedure is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -3411,27 +7755,22 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "4", "5", "6" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-5141-Procedure in (postcode-country) and BT-5101(a)-Procedure is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "classification-type",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-26(m)-Procedure",
-    "parentNodeId" : "ND-ProcedureMainClassificationCode",
-    "name" : "Classification Type (e.g. CPV)",
-    "btId" : "BT-26",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode/@listName",
-    "xpathRelative" : "@listName",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-513-Organization-Company",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Organisation City",
+    "btId" : "BT-513",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:CityName",
+    "xpathRelative" : "cbc:CityName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3449,27 +7788,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "classification-type",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-262-Lot",
-    "parentNodeId" : "ND-LotMainClassification",
-    "name" : "Main Classification Code",
-    "btId" : "BT-262",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-513-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "City",
+    "btId" : "BT-513",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:CityName",
+    "xpathRelative" : "cbc:CityName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3478,7 +7811,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Touchpoint} ${BT-514-Organization-TouchPoint is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -3487,57 +7825,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "cpv",
-        "type" : "hierarchical"
-      },
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-LotProcurementScope} ${(BT-71-Lot == 'res-pub-ser') and (BT-262-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${BT-262-Lot in ('75121000', '75122000', '75123000', '79622000', '79624000', '79625000', '80110000', '80300000', '80420000', '80430000', '80511000', '80520000', '80590000', '85000000', '85100000', '85110000', '85111000', '85111100', '85111200', '85111300', '85111310', '85111320', '85111400', '85111500', '85111600', '85111700', '85111800', '85111810', '85111820', '85111900', '85112000', '85112100', '85112200', '85120000', '85121000', '85121100', '85121200', '85121210', '85121220', '85121230', '85121231', '85121232', '85121240', '85121250', '85121251', '85121252', '85121270', '85121271', '85121280', '85121281', '85121282', '85121283', '85121290', '85121291', '85121292', '85121300', '85130000', '85131000', '85131100', '85131110', '85140000', '85141000', '85141100', '85141200', '85141210', '85141211', '85141220', '85142000', '85142100', '85142200', '85142300', '85142400', '85143000', '85144000', '85144100', '85145000', '85146000', '85146100', '85146200', '85147000', '85148000', '85149000', '85150000', '85160000', '85170000', '85171000', '85172000', '85200000', '85210000', '85300000', '85310000', '85311000', '85311100', '85311200', '85311300', '85312000', '85312100', '85312110', '85312120', '85312200', '85312300', '85312310', '85312320', '85312330', '85312400', '85312500', '85312510', '85320000', '85321000', '85322000', '85323000',  '92500000', '92600000', '98133000', '98133110')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0200"
-      }, {
-        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot == 'supplies') and (BT-262-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'0') or starts-with(BT-262-Lot,'1') or starts-with(BT-262-Lot,'2') or starts-with(BT-262-Lot,'3') or starts-with(BT-262-Lot,'40') or starts-with(BT-262-Lot,'41') or starts-with(BT-262-Lot,'42') or starts-with(BT-262-Lot,'43') or starts-with(BT-262-Lot,'44') or starts-with(BT-262-Lot,'48')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0203"
-      }, {
-        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot == 'works') and (BT-262-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0206"
-      }, {
-        "condition" : "{ND-LotProcurementScope} ${(BT-23-Lot == 'services') and (BT-262-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'49') or starts-with(BT-262-Lot,'5') or starts-with(BT-262-Lot,'6') or starts-with(BT-262-Lot,'7') or starts-with(BT-262-Lot,'8') or starts-with(BT-262-Lot,'9')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0209"
-      }, {
-        "condition" : "{ND-LotProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Lot is present)}",
-        "value" : "{ND-LotProcurementScope} ${starts-with(BT-262-Lot,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0212"
-      } ]
     }
   }, {
-    "id" : "BT-262-Part",
-    "parentNodeId" : "ND-PartMainClassification",
-    "name" : "Main Classification Code",
-    "btId" : "BT-262",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-513-UBO",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "City",
+    "btId" : "BT-513",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:CityName",
+    "xpathRelative" : "cbc:CityName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3546,66 +7848,26 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "4", "5", "6" ],
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-UBO} ${BT-500-UBO is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "cpv",
-        "type" : "hierarchical"
-      },
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-PartProcurementScope} ${(BT-71-Part == 'res-pub-ser') and (BT-262-Part is present)}",
-        "value" : "{ND-PartProcurementScope} ${BT-262-Part in ('75121000', '75122000', '75123000', '79622000', '79624000', '79625000', '80110000', '80300000', '80420000', '80430000', '80511000', '80520000', '80590000', '85000000', '85100000', '85110000', '85111000', '85111100', '85111200', '85111300', '85111310', '85111320', '85111400', '85111500', '85111600', '85111700', '85111800', '85111810', '85111820', '85111900', '85112000', '85112100', '85112200', '85120000', '85121000', '85121100', '85121200', '85121210', '85121220', '85121230', '85121231', '85121232', '85121240', '85121250', '85121251', '85121252', '85121270', '85121271', '85121280', '85121281', '85121282', '85121283', '85121290', '85121291', '85121292', '85121300', '85130000', '85131000', '85131100', '85131110', '85140000', '85141000', '85141100', '85141200', '85141210', '85141211', '85141220', '85142000', '85142100', '85142200', '85142300', '85142400', '85143000', '85144000', '85144100', '85145000', '85146000', '85146100', '85146200', '85147000', '85148000', '85149000', '85150000', '85160000', '85170000', '85171000', '85172000', '85200000', '85210000', '85300000', '85310000', '85311000', '85311100', '85311200', '85311300', '85312000', '85312100', '85312110', '85312120', '85312200', '85312300', '85312310', '85312320', '85312330', '85312400', '85312500', '85312510', '85320000', '85321000', '85322000', '85323000',  '92500000', '92600000', '98133000', '98133110')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0201"
-      }, {
-        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part == 'supplies') and (BT-262-Part is present)}",
-        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'0') or starts-with(BT-262-Part,'1') or starts-with(BT-262-Part,'2') or starts-with(BT-262-Part,'3') or starts-with(BT-262-Part,'40') or starts-with(BT-262-Part,'41') or starts-with(BT-262-Part,'42') or starts-with(BT-262-Part,'43') or starts-with(BT-262-Part,'44') or starts-with(BT-262-Part,'48')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0204"
-      }, {
-        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part == 'works') and (BT-262-Part is present)}",
-        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0207"
-      }, {
-        "condition" : "{ND-PartProcurementScope} ${(BT-23-Part == 'services') and (BT-262-Part is present)}",
-        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'49') or starts-with(BT-262-Part,'5') or starts-with(BT-262-Part,'6') or starts-with(BT-262-Part,'7') or starts-with(BT-262-Part,'8') or starts-with(BT-262-Part,'9')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0210"
-      }, {
-        "condition" : "{ND-PartProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Part is present)}",
-        "value" : "{ND-PartProcurementScope} ${starts-with(BT-262-Part,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0213"
-      } ]
     }
   }, {
-    "id" : "BT-262-Procedure",
-    "parentNodeId" : "ND-ProcedureMainClassification",
-    "name" : "Main Classification Code",
-    "btId" : "BT-262",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-5131-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance City",
+    "btId" : "BT-5131",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CityName",
+    "xpathRelative" : "cbc:CityName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3614,74 +7876,79 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-727-Lot is present or BT-5141-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "cpv",
-        "type" : "hierarchical"
-      },
+    }
+  }, {
+    "id" : "BT-5131-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance City",
+    "btId" : "BT-5131",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CityName",
+    "xpathRelative" : "cbc:CityName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
-    "inChangeNotice" : {
-      "value" : {
-        "canAdd" : true,
-        "canModify" : true,
-        "canRemove" : true
-      },
+    "forbidden" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "condition" : "{ND-ProcedureMainClassification} ${notice(BT-758-notice)/OPP-070-notice in ('10','11','CEI','12','13','14','15','16','17','18','19','E3','20','21','22','23','24','25','26','27','28','29','30','31','32','E4','T02','33','34','35','36','37','38','39','40','E5') and (notice(BT-758-notice)/BT-262-Procedure is present)}",
-        "value" : {
-          "canModify" : false
-        },
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure == 'supplies') and (BT-262-Procedure is present)}",
-        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'0') or starts-with(BT-262-Procedure,'1') or starts-with(BT-262-Procedure,'2') or starts-with(BT-262-Procedure,'3') or starts-with(BT-262-Procedure,'40') or starts-with(BT-262-Procedure,'41') or starts-with(BT-262-Procedure,'42') or starts-with(BT-262-Procedure,'43') or starts-with(BT-262-Procedure,'44') or starts-with(BT-262-Procedure,'48')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0202"
-      }, {
-        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure == 'works') and (BT-262-Procedure is present)}",
-        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0205"
       }, {
-        "condition" : "{ND-ProcedureProcurementScope} ${(BT-23-Procedure == 'services') and (BT-262-Procedure is present)}",
-        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'49') or starts-with(BT-262-Procedure,'5') or starts-with(BT-262-Procedure,'6') or starts-with(BT-262-Procedure,'7') or starts-with(BT-262-Procedure,'8') or starts-with(BT-262-Procedure,'9')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0208"
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-727-Part is present or BT-5141-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-5131-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance City",
+    "btId" : "BT-5131",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CityName",
+    "xpathRelative" : "cbc:CityName",
+    "type" : "text",
+    "legalType" : "TEXT",
+    "maxLength" : 400,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
       }, {
-        "condition" : "{ND-ProcedureProcurementScope} ${(OPP-070-notice in ('1','4','7','8','9','10','12','16','17','18','19','20','23','25','29','33','36','38')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la')) and (BT-262-Procedure is present)}",
-        "value" : "{ND-ProcedureProcurementScope} ${starts-with(BT-262-Procedure,'45')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00262-0211"
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-727-Procedure is present or BT-5141-Procedure is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-263-Lot",
-    "parentNodeId" : "ND-LotAdditionalClassification",
-    "name" : "Additional Classification Code",
-    "btId" : "BT-263",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
+    "id" : "BT-514-Organization-Company",
+    "parentNodeId" : "ND-CompanyAddress",
+    "name" : "Organisation Country Code",
+    "btId" : "BT-514",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cac:Country/cbc:IdentificationCode",
+    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -3692,25 +7959,35 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "cpv",
-        "type" : "hierarchical"
+        "id" : "eforms-country",
+        "type" : "flat",
+        "parentId" : "country"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-263-Part",
-    "parentNodeId" : "ND-PartAdditionalClassification",
-    "name" : "Additional Classification Code",
-    "btId" : "BT-263",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
+    "id" : "BT-514-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointAddress",
+    "name" : "Country Code",
+    "btId" : "BT-514",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cac:Country/cbc:IdentificationCode",
+    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -3721,25 +7998,31 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Touchpoint} ${BT-500-Organization-TouchPoint is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "cpv",
-        "type" : "hierarchical"
+        "id" : "eforms-country",
+        "type" : "flat",
+        "parentId" : "country"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-263-Procedure",
-    "parentNodeId" : "ND-ProcedureAdditionalCommodityClassification",
-    "name" : "Additional Classification Code",
-    "btId" : "BT-263",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification/cbc:ItemClassificationCode",
-    "xpathRelative" : "cbc:ItemClassificationCode",
+    "id" : "BT-514-UBO",
+    "parentNodeId" : "ND-UBOAddress",
+    "name" : "Country Code",
+    "btId" : "BT-514",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cac:Country/cbc:IdentificationCode",
+    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -3750,27 +8033,33 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-UBO} ${BT-500-UBO is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "cpv",
-        "type" : "hierarchical"
+        "id" : "eforms-country",
+        "type" : "flat",
+        "parentId" : "country"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-27-Lot",
-    "parentNodeId" : "ND-LotValueEstimate",
-    "name" : "Estimated Value",
-    "btId" : "BT-27",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount",
-    "xpathRelative" : "cbc:EstimatedOverallContractAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
+    "id" : "BT-5141-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Country Code",
+    "btId" : "BT-5141",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode",
+    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3779,42 +8068,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-727-Lot in ('anyw', 'anyw-eea')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-27-Part",
-    "parentNodeId" : "ND-PartValueEstimate",
-    "name" : "Estimated Value",
-    "btId" : "BT-27",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount",
-    "xpathRelative" : "cbc:EstimatedOverallContractAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-country",
+        "type" : "flat",
+        "parentId" : "country"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-27-Procedure",
-    "parentNodeId" : "ND-ProcedureValueEstimate",
-    "name" : "Estimated Value",
-    "btId" : "BT-27",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount",
-    "xpathRelative" : "cbc:EstimatedOverallContractAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
+    "id" : "BT-5141-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Country Code",
+    "btId" : "BT-5141",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode",
+    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3823,42 +8112,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "15", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-727-Part in ('anyw', 'anyw-eea')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-271-Lot",
-    "parentNodeId" : "ND-LotValueEstimateExtension",
-    "name" : "Framework Maximum Value",
-    "btId" : "BT-271",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:FrameworkMaximumAmount",
-    "xpathRelative" : "efbc:FrameworkMaximumAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "4", "5", "6" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-country",
+        "type" : "flat",
+        "parentId" : "country"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-271-Procedure",
-    "parentNodeId" : "ND-ProcedureValueEstimateExtension",
-    "name" : "Framework Maximum Value",
-    "btId" : "BT-271",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:FrameworkMaximumAmount",
-    "xpathRelative" : "efbc:FrameworkMaximumAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
+    "id" : "BT-5141-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Country Code",
+    "btId" : "BT-5141",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode",
+    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3867,44 +8156,58 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "14", "15", "19", "23", "24", "25", "26", "27", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-727-Procedure in ('anyw', 'anyw-eea')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-300-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Additional Information",
-    "btId" : "BT-300",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:Note",
-    "xpathRelative" : "cbc:Note",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 10000,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-country",
+        "type" : "flat",
+        "parentId" : "country"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-300-Part",
-    "parentNodeId" : "ND-PartProcurementScope",
-    "name" : "Additional Information",
-    "btId" : "BT-300",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:Note",
-    "xpathRelative" : "cbc:Note",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 10000,
+    "id" : "BT-5141-Procedure-List",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Country Code Listname",
+    "btId" : "BT-5141",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode/@listName",
+    "xpathRelative" : "cac:Country/cbc:IdentificationCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-5141-Procedure",
+    "presetValue" : "country",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-52-Lot",
+    "parentNodeId" : "ND-LotTenderingProcess",
+    "name" : "Successive Reduction Indicator (Lot)",
+    "btId" : "BT-52",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:CandidateReductionConstraintIndicator",
+    "xpathRelative" : "cbc:CandidateReductionConstraintIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3913,21 +8216,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-300-Procedure",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
-    "name" : "Additional Information",
-    "btId" : "BT-300",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cbc:Note",
-    "xpathRelative" : "cbc:Note",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 10000,
+    "id" : "BT-531-Lot",
+    "parentNodeId" : "ND-LotContractAdditionalNature",
+    "name" : "Additional Nature (different from Main)",
+    "btId" : "BT-531",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3936,52 +8245,49 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotProcurementScope} ${BT-23-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-contract-nature",
+        "type" : "flat",
+        "parentId" : "contract-nature"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-31-Procedure",
-    "parentNodeId" : "ND-LotDistribution",
-    "name" : "Lots Max Allowed",
-    "btId" : "BT-31",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cbc:MaximumLotsSubmittedNumeric",
-    "xpathRelative" : "cbc:MaximumLotsSubmittedNumeric",
-    "type" : "number",
-    "legalType" : "NUMBER",
+    "id" : "BT-531-Lot-List",
+    "parentNodeId" : "ND-LotContractAdditionalNature",
+    "name" : "Additional Nature (different from Main) Listname",
+    "btId" : "BT-531",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-531-Lot",
+    "presetValue" : "contract-nature",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-LotDistribution} ${BT-31-Procedure is present}",
-        "value" : "{ND-LotDistribution} ${BT-31-Procedure <= count(BT-137-Lot)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00031-0100"
-      } ]
     }
   }, {
-    "id" : "BT-33-Procedure",
-    "parentNodeId" : "ND-LotDistribution",
-    "name" : "Lots Max Awarded",
-    "btId" : "BT-33",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cbc:MaximumLotsAwardedNumeric",
-    "xpathRelative" : "cbc:MaximumLotsAwardedNumeric",
-    "type" : "number",
-    "legalType" : "NUMBER",
+    "id" : "BT-531-Part",
+    "parentNodeId" : "ND-PartContractAdditionalNature",
+    "name" : "Additional Nature (different from Main)",
+    "btId" : "BT-531",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -3990,31 +8296,49 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartProcurementScope} ${BT-23-Part is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-LotDistribution} ${(BT-33-Procedure is present) and (BT-31-Procedure is present)}",
-        "value" : "{ND-LotDistribution} ${BT-33-Procedure <= BT-31-Procedure}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00033-0100"
-      } ]
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-contract-nature",
+        "type" : "flat",
+        "parentId" : "contract-nature"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-330-Procedure",
-    "parentNodeId" : "ND-GroupComposition",
-    "name" : "Group Identifier",
-    "btId" : "BT-330",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cbc:LotsGroupID",
-    "xpathRelative" : "cbc:LotsGroupID",
-    "type" : "id-ref",
-    "idSchemes" : [ "GLO" ],
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-531-Part-List",
+    "parentNodeId" : "ND-PartContractAdditionalNature",
+    "name" : "Additional Nature (different from Main) Listname",
+    "btId" : "BT-531",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-531-Part",
+    "presetValue" : "contract-nature",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-531-Procedure",
+    "parentNodeId" : "ND-ProcedureContractAdditionalNature",
+    "name" : "Additional Nature (different from Main)",
+    "btId" : "BT-531",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4023,34 +8347,49 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-ProcedureProcurementScope} ${BT-23-Procedure is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^GLO-\\d{4}$",
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-contract-nature",
+        "type" : "flat",
+        "parentId" : "contract-nature"
+      },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-LotDistribution} ${BT-330-Procedure is present}",
-        "value" : "{ND-LotDistribution} ${every text:$group in BT-330-Procedure satisfies ($group in /BT-137-LotsGroup)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00330-0100"
-      } ]
     }
   }, {
-    "id" : "BT-36-Lot",
+    "id" : "BT-531-Procedure-List",
+    "parentNodeId" : "ND-ProcedureContractAdditionalNature",
+    "name" : "Additional Nature (different from Main) Listname",
+    "btId" : "BT-531",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-531-Procedure",
+    "presetValue" : "contract-nature",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-536-Lot",
     "parentNodeId" : "ND-LotDuration",
-    "name" : "Duration Period",
-    "btId" : "BT-36",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
-    "xpathRelative" : "cbc:DurationMeasure",
-    "type" : "measure",
-    "legalType" : "DURATION",
+    "name" : "Duration Start Date",
+    "btId" : "BT-536",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:StartDate",
+    "xpathRelative" : "cbc:StartDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4062,36 +8401,54 @@
         "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "38", "39", "40", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotDuration} ${BT-36-Lot is not present and BT-537-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     },
     "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "CEI" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "38", "39", "40", "CEI", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "T01" ],
+        "condition" : "{ND-LotDuration} ${BT-537-Lot is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "condition" : "{ND-LotDuration} ${(BT-71-Lot == 'res-pub-ser') and (BT-36-Lot is present)}",
-        "value" : "{ND-LotDuration} ${(BT-36-Lot > P0D) and (BT-36-Lot <= P3Y)}",
+        "value" : "{ND-LotDuration} ${((BT-536-Lot is present) and (BT-537-Lot is present) and (BT-536-Lot < BT-537-Lot)) or not((BT-536-Lot is present) and (BT-537-Lot is present))}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00036-0150"
+        "message" : "rule|text|BR-BT-00536-0150"
+      }, {
+        "condition" : "{ND-LotDuration} ${(BT-71-Lot == 'res-pub-ser') and (BT-536-Lot is present) and (BT-537-Lot is present)}",
+        "value" : "{ND-LotDuration} ${((BT-537-Lot - BT-536-Lot) > P0D) and ((BT-537-Lot - BT-536-Lot) <= P3Y)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00536-0152"
       } ]
     }
   }, {
-    "id" : "BT-36-Part",
+    "id" : "BT-536-Part",
     "parentNodeId" : "ND-PartDuration",
-    "name" : "Duration Period",
-    "btId" : "BT-36",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
-    "xpathRelative" : "cbc:DurationMeasure",
-    "type" : "measure",
-    "legalType" : "DURATION",
+    "name" : "Duration Start Date",
+    "btId" : "BT-536",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:StartDate",
+    "xpathRelative" : "cbc:StartDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4103,49 +8460,40 @@
         "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartDuration} ${BT-36-Part is not present and BT-537-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "condition" : "{ND-PartDuration} ${(BT-71-Part == 'res-pub-ser') and (BT-36-Part is present)}",
-        "value" : "{ND-PartDuration} ${(BT-36-Part > P0D) and (BT-36-Part <= P3Y)}",
+        "value" : "{ND-PartDuration} ${((BT-536-Part is present) and (BT-537-Part is present) and (BT-536-Part < BT-537-Part)) or not((BT-536-Part is present) and (BT-537-Part is present))}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00036-0151"
-      } ]
-    }
-  }, {
-    "id" : "BT-40-Lot",
-    "parentNodeId" : "ND-SelectionCriteria",
-    "name" : "Selection Criteria Second Stage Invite",
-    "btId" : "BT-40",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efbc:SecondStageIndicator",
-    "xpathRelative" : "efbc:SecondStageIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
+        "message" : "rule|text|BR-BT-00536-0151"
+      }, {
+        "condition" : "{ND-PartDuration} ${(BT-71-Part == 'res-pub-ser') and (BT-536-Part is present) and (BT-537-Part is present)}",
+        "value" : "{ND-PartDuration} ${((BT-537-Part - BT-536-Part) > P0D) and ((BT-537-Part - BT-536-Part) <= P3Y)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00536-0153"
       } ]
-    }
-  }, {
-    "id" : "BT-41-Lot",
-    "parentNodeId" : "ND-AwardingTerms",
-    "name" : "Following Contract",
-    "btId" : "BT-41",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cbc:FollowupContractIndicator",
-    "xpathRelative" : "cbc:FollowupContractIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    }
+  }, {
+    "id" : "BT-537-Lot",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Duration End Date",
+    "btId" : "BT-537",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4154,7 +8502,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "CEI", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "38", "39", "40", "T01", "T02" ],
+        "condition" : "{ND-LotDuration} ${(BT-36-Lot is present) or (BT-538-Lot is present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -4163,20 +8516,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "23", "24" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "15", "16", "17", "18", "19", "22", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-42-Lot",
-    "parentNodeId" : "ND-AwardingTerms",
-    "name" : "Jury Decision Binding",
-    "btId" : "BT-42",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cbc:BindingOnBuyerIndicator",
-    "xpathRelative" : "cbc:BindingOnBuyerIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-537-Part",
+    "parentNodeId" : "ND-PartDuration",
+    "name" : "Duration End Date",
+    "btId" : "BT-537",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4185,29 +8542,29 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "23", "24" ],
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartDuration} ${BT-36-Part is present or BT-538-Part is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-44-Lot",
-    "parentNodeId" : "ND-Prize",
-    "name" : "Prize Rank",
-    "btId" : "BT-44",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:RankCode",
-    "xpathRelative" : "cbc:RankCode",
-    "type" : "integer",
-    "legalType" : "NUMBER",
+    "id" : "BT-538-Lot",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Duration Other",
+    "btId" : "BT-538",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode",
+    "xpathRelative" : "cbc:DescriptionCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4216,137 +8573,251 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "CEI", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "38", "39", "40", "T01", "T02" ],
+        "condition" : "{ND-LotDuration} ${(BT-36-Lot is present) or (BT-537-Lot is present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-45-Lot",
-    "parentNodeId" : "ND-Prize",
-    "name" : "Rewards Other",
-    "btId" : "BT-45",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "15", "16", "17", "18", "19", "22", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "duration",
+        "type" : "flat",
+        "parentId" : "timeperiod"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-LotDuration} ${not(BT-538-Lot == 'UNKNOWN') or (not(BT-03-notice in ('cont-modif','dir-awa-pre') ) and not(BT-137-Lot in BT-13713-LotResult[BT-142-LotResult == 'selec-w']))}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00538-0130"
+      } ]
     }
   }, {
-    "id" : "BT-46-Lot",
-    "parentNodeId" : "ND-AwardingTerms",
-    "name" : "Jury Member Name",
-    "btId" : "BT-46",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:TechnicalCommitteePerson/cbc:FamilyName",
-    "xpathRelative" : "cac:TechnicalCommitteePerson/cbc:FamilyName",
+    "id" : "BT-538-Lot-List",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Duration Other Listname",
+    "btId" : "BT-538",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode/@listName",
+    "xpathRelative" : "cbc:DescriptionCode/@listName",
     "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "attributeName" : "listName",
+    "attributeOf" : "BT-538-Lot",
+    "presetValue" : "timeperiod",
+    "legalType" : "CODE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-538-Part",
+    "parentNodeId" : "ND-PartDuration",
+    "name" : "Duration Other",
+    "btId" : "BT-538",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode",
+    "xpathRelative" : "cbc:DescriptionCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartDuration} ${BT-36-Part is present or BT-537-Part is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "duration",
+        "type" : "flat",
+        "parentId" : "timeperiod"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-47-Lot",
-    "parentNodeId" : "ND-Participants",
-    "name" : "Participant Name",
-    "btId" : "BT-47",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList/cac:PreSelectedParty/cac:PartyName/cbc:Name",
-    "xpathRelative" : "cac:PreSelectedParty/cac:PartyName/cbc:Name",
+    "id" : "BT-538-Part-List",
+    "parentNodeId" : "ND-PartDuration",
+    "name" : "Duration Other Listname",
+    "btId" : "BT-538",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode/@listName",
+    "xpathRelative" : "cbc:DescriptionCode/@listName",
     "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "attributeName" : "listName",
+    "attributeOf" : "BT-538-Part",
+    "presetValue" : "timeperiod",
+    "legalType" : "CODE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-539-Lot",
+    "parentNodeId" : "ND-LotAwardCriterion",
+    "name" : "Award Criterion Type",
+    "btId" : "BT-539",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:AwardingCriterionTypeCode[@listName='award-criterion-type']",
+    "xpathRelative" : "cbc:AwardingCriterionTypeCode[@listName='award-criterion-type']",
+    "type" : "code",
+    "legalType" : "CODE",
+    "privacy" : {
+      "code" : "awa-cri-typ",
+      "unpublishedFieldId" : "BT-195(BT-539)-Lot",
+      "reasonCodeFieldId" : "BT-197(BT-539)-Lot",
+      "reasonDescriptionFieldId" : "BT-196(BT-539)-Lot",
+      "publicationDateFieldId" : "BT-198(BT-539)-Lot"
+    },
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-50-Lot",
-    "parentNodeId" : "ND-SecondStage",
-    "name" : "Minimum Candidates",
-    "btId" : "BT-50",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList/cbc:MinimumQuantity",
-    "xpathRelative" : "cbc:MinimumQuantity",
-    "type" : "integer",
-    "legalType" : "NUMBER",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "29", "31", "32" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
+    "codeList" : {
+      "value" : {
+        "id" : "award-criterion-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-SecondStage} ${(BT-50-Lot <= BT-51-Lot) or not(BT-51-Lot is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00050-0100"
-      }, {
-        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'restricted') and (BT-50-Lot > 4)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'restricted')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00050-0101"
-      }, {
-        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'neg-w-call') and (BT-50-Lot > 2)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'neg-w-call')}",
+        "value" : "{ND-LotAwardCriteria} ${((BT-5421-Lot == 'ord-imp') and not(BT-5421-Lot != 'ord-imp')) or not(BT-5421-Lot == 'ord-imp')}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00050-0102"
+        "message" : "rule|text|BR-BT-00539-0194"
       }, {
-        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'comp-dial') and (BT-50-Lot > 2)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'comp-dial')}",
+        "condition" : "{ND-LotAwardCriteria} ${BT-541-Lot-WeightNumber[BT-5421-Lot == 'ord-imp'] is present}",
+        "value" : "{ND-LotAwardCriteria} ${every number:$ordImp in BT-541-Lot-WeightNumber[BT-5421-Lot == 'ord-imp'] satisfies (format-number($ordImp, '#') == string($ordImp))}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00050-0103"
+        "message" : "rule|text|BR-BT-00539-0196"
       }, {
-        "value" : "{ND-SecondStage} ${((OPP-070-notice == '16') and (BT-105-Procedure == 'innovation') and (BT-50-Lot > 2)) or not(OPP-070-notice == '16') or not(BT-105-Procedure == 'innovation')}",
+        "condition" : "{ND-LotAwardCriteria} ${BT-541-Lot-WeightNumber[BT-5421-Lot == 'ord-imp'] is present}",
+        "value" : "{ND-LotAwardCriteria} ${every number:$ordImp in BT-541-Lot-WeightNumber[BT-5421-Lot == 'ord-imp'] satisfies($ordImp <= count(BT-541-Lot-WeightNumber[BT-5421-Lot == 'ord-imp']))}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00050-0104"
+        "message" : "rule|text|BR-BT-00539-0197"
+      } ]
+    }
+  }, {
+    "id" : "BT-539-Lot-List",
+    "parentNodeId" : "ND-LotAwardCriterion",
+    "name" : "Award Criterion Type Listname",
+    "btId" : "BT-539",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:AwardingCriterionTypeCode[@listName='award-criterion-type']/@listName",
+    "xpathRelative" : "cbc:AwardingCriterionTypeCode[@listName='award-criterion-type']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-539-Lot",
+    "presetValue" : "award-criterion-type",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-54-Lot",
+    "parentNodeId" : "ND-OptionsAndRenewals",
+    "name" : "Options Description",
+    "btId" : "BT-54",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cbc:OptionsDescription",
+    "xpathRelative" : "cbc:OptionsDescription",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-500-Organization-Company",
-    "parentNodeId" : "ND-Company",
-    "name" : "Organisation Name",
-    "btId" : "BT-500",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyName/cbc:Name",
-    "xpathRelative" : "cac:PartyName/cbc:Name",
+    "id" : "BT-54-Lot-Language",
+    "parentNodeId" : "ND-OptionsAndRenewals",
+    "name" : "Options Description Language",
+    "btId" : "BT-54",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cbc:OptionsDescription/@languageID",
+    "xpathRelative" : "cbc:OptionsDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-54-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-540-Lot",
+    "parentNodeId" : "ND-LotAwardCriterion",
+    "name" : "Award Criterion Description",
+    "btId" : "BT-540",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:Description",
+    "xpathRelative" : "cbc:Description",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
-    "maxLength" : 400,
+    "maxLength" : 6000,
+    "privacy" : {
+      "code" : "awa-cri-des",
+      "unpublishedFieldId" : "BT-195(BT-540)-Lot",
+      "reasonCodeFieldId" : "BT-197(BT-540)-Lot",
+      "reasonDescriptionFieldId" : "BT-196(BT-540)-Lot",
+      "publicationDateFieldId" : "BT-198(BT-540)-Lot"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4355,7 +8826,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotAwardCriterion} ${BT-539-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -4364,75 +8840,72 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-500-Organization-TouchPoint",
-    "parentNodeId" : "ND-Touchpoint",
-    "name" : "Name",
-    "btId" : "BT-500",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PartyName/cbc:Name",
-    "xpathRelative" : "cac:PartyName/cbc:Name",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
+        "value" : "{ND-LotAwardCriterion} ${(count(BT-5423-Lot[BT-5423-Lot =='min-score']) <= 1) and (count(BT-5423-Lot[BT-5423-Lot =='max-pass']) <= 1)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00540-0150"
       } ]
     }
   }, {
-    "id" : "BT-500-UBO",
-    "parentNodeId" : "ND-UBO",
-    "name" : "UBO Name",
-    "btId" : "BT-500",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cbc:FamilyName",
-    "xpathRelative" : "cbc:FamilyName",
-    "type" : "text",
+    "id" : "BT-540-Lot-Language",
+    "parentNodeId" : "ND-LotAwardCriterion",
+    "name" : "Award Criterion Description Language",
+    "btId" : "BT-540",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-540-Lot",
     "legalType" : "TEXT",
-    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-501-Organization-Company",
-    "parentNodeId" : "ND-Company",
-    "name" : "Organisation Identifier",
-    "btId" : "BT-501",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity/cbc:CompanyID",
-    "xpathRelative" : "cac:PartyLegalEntity/cbc:CompanyID",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-541-Lot-FixedNumber",
+    "parentNodeId" : "ND-LotAwardFixedCriterionParameter",
+    "name" : "Award Criterion Fixed Number",
+    "btId" : "BT-541",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efbc:ParameterNumeric",
+    "xpathRelative" : "efbc:ParameterNumeric",
+    "type" : "number",
+    "legalType" : "NUMBER",
+    "privacy" : {
+      "code" : "awa-cri-num",
+      "unpublishedFieldId" : "BT-195(BT-541)-Lot-Fixed",
+      "reasonCodeFieldId" : "BT-197(BT-541)-Lot-Fixed",
+      "reasonDescriptionFieldId" : "BT-196(BT-541)-Lot-Fixed",
+      "publicationDateFieldId" : "BT-198(BT-541)-Lot-Fixed"
+    },
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotAwardCriterionParameters} ${BT-540-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -4441,20 +8914,28 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "4", "5", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "23", "24", "29", "30", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "29", "31", "32" ],
+        "condition" : "{ND-LotAwardCriterionParameters} ${BT-540-Lot is present and (BT-541-Lot-WeightNumber is not present) and (BT-541-Lot-ThresholdNumber is not present) }",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-5010-Lot",
-    "parentNodeId" : "ND-Funding",
-    "name" : "EU Funds Financing Identifier",
-    "btId" : "BT-5010",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Funding/efbc:FinancingIdentifier",
-    "xpathRelative" : "efbc:FinancingIdentifier",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-541-Lot-ThresholdNumber",
+    "parentNodeId" : "ND-LotAwardThresholdCriterionParameter",
+    "name" : "Award Criterion Threshold Number",
+    "btId" : "BT-541",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efbc:ParameterNumeric",
+    "xpathRelative" : "efbc:ParameterNumeric",
+    "type" : "number",
+    "legalType" : "NUMBER",
+    "privacy" : {
+      "code" : "awa-cri-num",
+      "unpublishedFieldId" : "BT-195(BT-541)-Lot-Threshold",
+      "reasonCodeFieldId" : "BT-197(BT-541)-Lot-Threshold",
+      "reasonDescriptionFieldId" : "BT-196(BT-541)-Lot-Threshold",
+      "publicationDateFieldId" : "BT-198(BT-541)-Lot-Threshold"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4463,44 +8944,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotAwardCriterionParameters} ${BT-540-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-502-Organization-Company",
-    "parentNodeId" : "ND-CompanyContact",
-    "name" : "Organisation Contact Point",
-    "btId" : "BT-502",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:Name",
-    "xpathRelative" : "cbc:Name",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "29", "31", "32" ],
+        "condition" : "{ND-LotAwardCriterionParameters} ${BT-540-Lot is present and (BT-541-Lot-WeightNumber is not present) and (BT-541-Lot-FixedNumber is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-502-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointContact",
-    "name" : "Contact Point",
-    "btId" : "BT-502",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:Name",
-    "xpathRelative" : "cbc:Name",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-541-Lot-WeightNumber",
+    "parentNodeId" : "ND-LotAwardWeightCriterionParameter",
+    "name" : "Award Criterion Weight Number",
+    "btId" : "BT-541",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efbc:ParameterNumeric",
+    "xpathRelative" : "efbc:ParameterNumeric",
+    "type" : "number",
+    "legalType" : "NUMBER",
+    "privacy" : {
+      "code" : "awa-cri-num",
+      "unpublishedFieldId" : "BT-195(BT-541)-Lot-Weight",
+      "reasonCodeFieldId" : "BT-197(BT-541)-Lot-Weight",
+      "reasonDescriptionFieldId" : "BT-196(BT-541)-Lot-Weight",
+      "publicationDateFieldId" : "BT-198(BT-541)-Lot-Weight"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4509,21 +8988,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotAwardCriterionParameters} ${BT-540-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "29", "31", "32" ],
+        "condition" : "{ND-LotAwardCriterionParameters} ${BT-540-Lot is present and (BT-541-Lot-FixedNumber is not present) and (BT-541-Lot-ThresholdNumber is not present) }",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-503-Organization-Company",
-    "parentNodeId" : "ND-CompanyContact",
-    "name" : "Organisation Contact Telephone Number",
-    "btId" : "BT-503",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:Telephone",
-    "xpathRelative" : "cbc:Telephone",
-    "type" : "phone",
-    "legalType" : "TEXT",
-    "maxLength" : 30,
+    "id" : "BT-5421-Lot",
+    "parentNodeId" : "ND-LotAwardWeightCriterionParameter",
+    "name" : "Award Criterion Number Weight",
+    "btId" : "BT-5421",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efbc:ParameterCode",
+    "xpathRelative" : "efbc:ParameterCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "privacy" : {
+      "code" : "awa-cri-wei",
+      "unpublishedFieldId" : "BT-195(BT-5421)-Lot",
+      "reasonCodeFieldId" : "BT-197(BT-5421)-Lot",
+      "reasonDescriptionFieldId" : "BT-196(BT-5421)-Lot",
+      "publicationDateFieldId" : "BT-198(BT-5421)-Lot"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4532,7 +9032,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotAwardWeightCriterionParameter} ${BT-541-Lot-WeightNumber is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -4541,52 +9046,60 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-503-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointContact",
-    "name" : "Contact Telephone Number",
-    "btId" : "BT-503",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:Telephone",
-    "xpathRelative" : "cbc:Telephone",
-    "type" : "phone",
-    "legalType" : "TEXT",
-    "maxLength" : 30,
-    "repeatable" : {
-      "value" : false,
+    "codeList" : {
+      "value" : {
+        "id" : "number-weight",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
+        "condition" : "{ND-LotAwardWeightCriterionParameter} ${(BT-03-notice in ('result', 'cont-modif', 'dir-awa-pre')) and (BT-5421-Lot is present)}",
+        "value" : "{ND-LotAwardWeightCriterionParameter} ${BT-5421-Lot in ('dec-exa', 'ord-imp', 'per-exa', 'poi-exa')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-05421-0250"
       } ]
-    },
-    "pattern" : {
-      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+    }
+  }, {
+    "id" : "BT-5421-Lot-List",
+    "parentNodeId" : "ND-LotAwardWeightCriterionParameter",
+    "name" : "Award Criterion Number Weight Listname",
+    "btId" : "BT-5421",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efbc:ParameterCode/@listName",
+    "xpathRelative" : "efbc:ParameterCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-5421-Lot",
+    "presetValue" : "number-weight",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-503-UBO",
-    "parentNodeId" : "ND-UBOContact",
-    "name" : "UBO Telephone Number",
-    "btId" : "BT-503",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact/cbc:Telephone",
-    "xpathRelative" : "cbc:Telephone",
-    "type" : "phone",
-    "legalType" : "TEXT",
-    "maxLength" : 30,
+    "id" : "BT-5422-Lot",
+    "parentNodeId" : "ND-LotAwardFixedCriterionParameter",
+    "name" : "Award Criterion Number Fixed",
+    "btId" : "BT-5422",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efbc:ParameterCode",
+    "xpathRelative" : "efbc:ParameterCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "privacy" : {
+      "code" : "awa-cri-fix",
+      "unpublishedFieldId" : "BT-195(BT-5422)-Lot",
+      "reasonCodeFieldId" : "BT-197(BT-5422)-Lot",
+      "reasonDescriptionFieldId" : "BT-196(BT-5422)-Lot",
+      "publicationDateFieldId" : "BT-198(BT-5422)-Lot"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4595,79 +9108,64 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotAwardFixedCriterionParameter} ${BT-541-Lot-FixedNumber is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-505-Organization-Company",
-    "parentNodeId" : "ND-Company",
-    "name" : "Organisation Internet Address",
-    "btId" : "BT-505",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cbc:WebsiteURI",
-    "xpathRelative" : "cbc:WebsiteURI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+    "codeList" : {
+      "value" : {
+        "id" : "number-fixed",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-505-Organization-TouchPoint",
-    "parentNodeId" : "ND-Touchpoint",
-    "name" : "Internet Address",
-    "btId" : "BT-505",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cbc:WebsiteURI",
-    "xpathRelative" : "cbc:WebsiteURI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-5422-Lot-List",
+    "parentNodeId" : "ND-LotAwardFixedCriterionParameter",
+    "name" : "Award Criterion Number Fixed Listname",
+    "btId" : "BT-5422",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efbc:ParameterCode/@listName",
+    "xpathRelative" : "efbc:ParameterCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-5422-Lot",
+    "presetValue" : "number-fixed",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-506-Organization-Company",
-    "parentNodeId" : "ND-CompanyContact",
-    "name" : "Organisation Contact Email Address",
-    "btId" : "BT-506",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:ElectronicMail",
-    "xpathRelative" : "cbc:ElectronicMail",
-    "type" : "email",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-5423-Lot",
+    "parentNodeId" : "ND-LotAwardThresholdCriterionParameter",
+    "name" : "Award Criterion Number Threshold",
+    "btId" : "BT-5423",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efbc:ParameterCode",
+    "xpathRelative" : "efbc:ParameterCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "privacy" : {
+      "code" : "awa-cri-thr",
+      "unpublishedFieldId" : "BT-195(BT-5423)-Lot",
+      "reasonCodeFieldId" : "BT-197(BT-5423)-Lot",
+      "reasonDescriptionFieldId" : "BT-196(BT-5423)-Lot",
+      "publicationDateFieldId" : "BT-198(BT-5423)-Lot"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4676,7 +9174,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
+        "condition" : "{ND-LotAwardThresholdCriterionParameter} ${BT-541-Lot-ThresholdNumber is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -4685,52 +9188,72 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^[a-zA-Z0-9][a-zA-Z0-9._%+-]*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,63}$",
+    "codeList" : {
+      "value" : {
+        "id" : "number-threshold",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-506-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointContact",
-    "name" : "Contact Email Address",
-    "btId" : "BT-506",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:ElectronicMail",
-    "xpathRelative" : "cbc:ElectronicMail",
-    "type" : "email",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-5423-Lot-List",
+    "parentNodeId" : "ND-LotAwardThresholdCriterionParameter",
+    "name" : "Award Criterion Number Threshold Listname",
+    "btId" : "BT-5423",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efbc:ParameterCode/@listName",
+    "xpathRelative" : "efbc:ParameterCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-5423-Lot",
+    "presetValue" : "number-threshold",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
+    }
+  }, {
+    "id" : "BT-543-Lot-Language",
+    "parentNodeId" : "ND-LotAwardCriteria",
+    "name" : "Award Criteria Complicated Language",
+    "btId" : "BT-543",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cbc:CalculationExpression/@languageID",
+    "xpathRelative" : "cbc:CalculationExpression/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-543-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^[a-zA-Z0-9][a-zA-Z0-9._%+-]*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,63}$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-506-UBO",
-    "parentNodeId" : "ND-UBOContact",
-    "name" : "UBO Email Address",
-    "btId" : "BT-506",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact/cbc:ElectronicMail",
-    "xpathRelative" : "cbc:ElectronicMail",
-    "type" : "email",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-553-Tender",
+    "parentNodeId" : "ND-SubcontractedContract",
+    "name" : "Subcontracting Value",
+    "btId" : "BT-553",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efbc:TermAmount",
+    "xpathRelative" : "efbc:TermAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
+    "privacy" : {
+      "code" : "sub-val",
+      "unpublishedFieldId" : "BT-195(BT-553)-Tender",
+      "reasonCodeFieldId" : "BT-197(BT-553)-Tender",
+      "reasonDescriptionFieldId" : "BT-196(BT-553)-Tender",
+      "publicationDateFieldId" : "BT-198(BT-553)-Tender"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4739,54 +9262,50 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^[a-zA-Z0-9][a-zA-Z0-9._%+-]*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,63}$",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-507-Organization-Company",
-    "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Organisation Country Subdivision",
-    "btId" : "BT-507",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:CountrySubentityCode",
-    "xpathRelative" : "cbc:CountrySubentityCode",
+    "id" : "BT-553-Tender-Currency",
+    "parentNodeId" : "ND-SubcontractedContract",
+    "name" : "Subcontracting Value Currency",
+    "btId" : "BT-553",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efbc:TermAmount/@currencyID",
+    "xpathRelative" : "efbc:TermAmount/@currencyID",
     "type" : "code",
-    "legalType" : "CODE",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-553-Tender",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "nuts-lvl3",
-        "type" : "flat",
-        "parentId" : "nuts"
+        "id" : "eforms-currency",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-507-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "Country Subdivision",
-    "btId" : "BT-507",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:CountrySubentityCode",
-    "xpathRelative" : "cbc:CountrySubentityCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-554-Tender",
+    "parentNodeId" : "ND-SubcontractedContract",
+    "name" : "Subcontracting Description",
+    "btId" : "BT-554",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efbc:TermDescription",
+    "xpathRelative" : "efbc:TermDescription",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "privacy" : {
+      "code" : "sub-des",
+      "unpublishedFieldId" : "BT-195(BT-554)-Tender",
+      "reasonCodeFieldId" : "BT-197(BT-554)-Tender",
+      "reasonDescriptionFieldId" : "BT-196(BT-554)-Tender",
+      "publicationDateFieldId" : "BT-198(BT-554)-Tender"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4795,28 +9314,49 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-554-Tender-Language",
+    "parentNodeId" : "ND-SubcontractedContract",
+    "name" : "Subcontracting Description Language",
+    "btId" : "BT-554",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efbc:TermDescription/@languageID",
+    "xpathRelative" : "efbc:TermDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-554-Tender",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "nuts-lvl3",
-        "type" : "flat",
-        "parentId" : "nuts"
+        "id" : "eu-official-language",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-507-UBO",
-    "parentNodeId" : "ND-UBOAddress",
-    "name" : "Country Subdivision",
-    "btId" : "BT-507",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:CountrySubentityCode",
-    "xpathRelative" : "cbc:CountrySubentityCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-555-Tender",
+    "parentNodeId" : "ND-SubcontractedContract",
+    "name" : "Subcontracting Percentage",
+    "btId" : "BT-555",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efbc:TermPercent",
+    "xpathRelative" : "efbc:TermPercent",
+    "type" : "number",
+    "legalType" : "NUMBER",
+    "privacy" : {
+      "code" : "sub-per",
+      "unpublishedFieldId" : "BT-195(BT-555)-Tender",
+      "reasonCodeFieldId" : "BT-197(BT-555)-Tender",
+      "reasonDescriptionFieldId" : "BT-196(BT-555)-Tender",
+      "publicationDateFieldId" : "BT-198(BT-555)-Tender"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4825,28 +9365,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "nuts-lvl3",
-        "type" : "flat",
-        "parentId" : "nuts"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5071-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance Country Subdivision",
-    "btId" : "BT-5071",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode",
-    "xpathRelative" : "cbc:CountrySubentityCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-556-NoticeResult",
+    "parentNodeId" : "ND-NoticeResultGroupFA",
+    "name" : "Group Framework Value Lot Identifier",
+    "btId" : "BT-556",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:TenderLot/cbc:ID",
+    "xpathRelative" : "efac:TenderLot/cbc:ID",
+    "type" : "id-ref",
+    "legalType" : "IDENTIFIER",
+    "privacy" : {
+      "code" : "gro-max-ide",
+      "unpublishedFieldId" : "BT-195(BT-556)-NoticeResult",
+      "reasonCodeFieldId" : "BT-197(BT-556)-NoticeResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-556)-NoticeResult",
+      "publicationDateFieldId" : "BT-198(BT-556)-NoticeResult"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4855,28 +9394,55 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "28", "32", "35", "36", "37", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "29", "30", "31", "33", "34", "38", "39" ],
+        "condition" : "{ND-NoticeResultGroupFA} ${not(every text:$groupResult in BT-556-NoticeResult, text:$lot in BT-1375-Procedure[BT-330-Procedure == $groupResult], text:$result in BT-142-LotResult[BT-13713-LotResult == $lot] satisfies ($result == 'selec-w')) or (every text:$group in BT-556-NoticeResult satisfies (count(BT-137-Lot[(BT-137-Lot in BT-1375-Procedure[BT-330-Procedure == $group]) and (BT-765-Lot in ('fa-mix','fa-w-rc','fa-wo-rc'))]) < 2))}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "nuts-lvl3",
-        "type" : "flat",
-        "parentId" : "nuts"
-      },
+    "pattern" : {
+      "value" : "^GLO-\\d{4}$",
       "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{BT-556-NoticeResult} ${BT-556-NoticeResult in /BT-137-LotsGroup}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00556-0100"
+      } ]
     }
   }, {
-    "id" : "BT-5071-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance Country Subdivision",
-    "btId" : "BT-5071",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode",
-    "xpathRelative" : "cbc:CountrySubentityCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-556-NoticeResult-Scheme",
+    "parentNodeId" : "ND-NoticeResultGroupFA",
+    "name" : "Group Framework Value Lot Identifier Schemename",
+    "btId" : "BT-556",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:TenderLot/cbc:ID/@schemeName",
+    "xpathRelative" : "efac:TenderLot/cbc:ID/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-556-NoticeResult",
+    "presetValue" : "LotsGroup",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-57-Lot",
+    "parentNodeId" : "ND-OptionsDescription",
+    "name" : "Renewal Description",
+    "btId" : "BT-57",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cac:Renewal/cac:Period/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4885,28 +9451,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-57-Lot-Language",
+    "parentNodeId" : "ND-OptionsDescription",
+    "name" : "Renewal Description Language",
+    "btId" : "BT-57",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cac:Renewal/cac:Period/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-57-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "nuts-lvl3",
-        "type" : "flat",
-        "parentId" : "nuts"
+        "id" : "eu-official-language",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5071-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance Country Subdivision",
-    "btId" : "BT-5071",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CountrySubentityCode",
-    "xpathRelative" : "cbc:CountrySubentityCode",
+    "id" : "BT-578-Lot",
+    "parentNodeId" : "ND-SecurityClearanceTerms",
+    "name" : "Security Clearance",
+    "btId" : "BT-578",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm/cbc:Code",
+    "xpathRelative" : "cbc:Code",
     "type" : "code",
-    "legalType" : "CODE",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4915,29 +9495,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "nuts-lvl3",
-        "type" : "flat",
-        "parentId" : "nuts"
+        "id" : "required",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-508-Procedure-Buyer",
-    "parentNodeId" : "ND-ContractingParty",
-    "name" : "Buyer Profile URL",
-    "btId" : "BT-508",
-    "xpathAbsolute" : "/*/cac:ContractingParty/cbc:BuyerProfileURI",
-    "xpathRelative" : "cbc:BuyerProfileURI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-578-Lot-List",
+    "parentNodeId" : "ND-SecurityClearanceTerms",
+    "name" : "Security Clearance Listname",
+    "btId" : "BT-578",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm/cbc:Code/@listName",
+    "xpathRelative" : "cbc:Code/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-578-Lot",
+    "presetValue" : "required",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-58-Lot",
+    "parentNodeId" : "ND-OptionsAndRenewals",
+    "name" : "Renewal Maximum",
+    "btId" : "BT-58",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cbc:MaximumNumberNumeric",
+    "xpathRelative" : "cbc:MaximumNumberNumeric",
+    "type" : "integer",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4946,7 +9540,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "38", "39", "40", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -4955,25 +9549,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3" ],
+        "noticeTypes" : [ "15", "17", "18" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-509-Organization-Company",
-    "parentNodeId" : "ND-Company",
-    "name" : "Organisation eDelivery Gateway",
-    "btId" : "BT-509",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cbc:EndpointID",
-    "xpathRelative" : "cbc:EndpointID",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-60-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "EU Funds",
+    "btId" : "BT-60",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:FundingProgramCode[@listName='eu-funded']",
+    "xpathRelative" : "cbc:FundingProgramCode[@listName='eu-funded']",
+    "type" : "code",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -4982,51 +9571,52 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-509-Organization-TouchPoint",
-    "parentNodeId" : "ND-Touchpoint",
-    "name" : "eDelivery Gateway",
-    "btId" : "BT-509",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cbc:EndpointID",
-    "xpathRelative" : "cbc:EndpointID",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "7", "10", "16", "19", "23", "29", "32", "36" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-funded",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-51-Lot",
-    "parentNodeId" : "ND-SecondStage",
-    "name" : "Maximum Candidates Number",
-    "btId" : "BT-51",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList/cbc:MaximumQuantity",
-    "xpathRelative" : "cbc:MaximumQuantity",
-    "type" : "integer",
-    "legalType" : "NUMBER",
+    "id" : "BT-60-Lot-List",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "EU Funds Listname",
+    "btId" : "BT-60",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:FundingProgramCode[@listName='eu-funded']/@listName",
+    "xpathRelative" : "cbc:FundingProgramCode[@listName='eu-funded']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-60-Lot",
+    "presetValue" : "eu-funded",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-610-Procedure-Buyer",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Activity Entity",
+    "btId" : "BT-610",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingActivity/cbc:ActivityTypeCode[@listName='entity-activity']",
+    "xpathRelative" : "cac:ContractingActivity/cbc:ActivityTypeCode[@listName='entity-activity']",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5035,30 +9625,57 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "4", "7", "10", "12", "16", "20", "22", "23", "25", "29", "33", "36", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "3", "6", "9", "13", "14", "18", "19", "21", "26", "27", "28", "31", "32", "34", "35" ],
+        "condition" : "{ND-ContractingParty} ${BT-11-Procedure-Buyer not in ('pub-undert','pub-undert-cga','pub-undert-la','pub-undert-ra','spec-rights-entity')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
+    "mandatory" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-SecondStage} ${(BT-40-Lot == TRUE) or not(BT-51-Lot is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00051-0100"
+        "noticeTypes" : [ "2", "5", "8", "11", "14", "15", "17", "19", "24", "30", "32", "35", "37" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "entity-activity",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-510(a)-Organization-Company",
-    "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Street",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:StreetName",
-    "xpathRelative" : "cbc:StreetName",
+    "id" : "BT-610-Procedure-Buyer-List",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Activity Entity Listname",
+    "btId" : "BT-610",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingActivity/cbc:ActivityTypeCode[@listName='entity-activity']/@listName",
+    "xpathRelative" : "cac:ContractingActivity/cbc:ActivityTypeCode[@listName='entity-activity']/@listName",
     "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-610-Procedure-Buyer",
+    "presetValue" : "entity-activity",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-6110-Contract",
+    "parentNodeId" : "ND-ContractEUFunds",
+    "name" : "Contract EU Funds Details",
+    "btId" : "BT-6110",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
     "legalType" : "TEXT",
-    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5067,21 +9684,47 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40" ],
+        "condition" : "{ND-ContractEUFunds} ${BT-722-Contract is not present and BT-5011-Contract is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-510(a)-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "Street",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:StreetName",
-    "xpathRelative" : "cbc:StreetName",
-    "type" : "text",
+    "id" : "BT-6110-Contract-Language",
+    "parentNodeId" : "ND-ContractEUFunds",
+    "name" : "Contract EU Funds Details Language",
+    "btId" : "BT-6110",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-6110-Contract",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-6140-Lot",
+    "parentNodeId" : "ND-Funding",
+    "name" : "EU Funds Details",
+    "btId" : "BT-6140",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Funding/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
     "legalType" : "TEXT",
-    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5090,20 +9733,47 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-Funding} ${BT-7220-Lot is not present and BT-5010-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-510(a)-UBO",
-    "parentNodeId" : "ND-UBOAddress",
-    "name" : "Street",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:StreetName",
-    "xpathRelative" : "cbc:StreetName",
-    "type" : "text",
+    "id" : "BT-6140-Lot-Language",
+    "parentNodeId" : "ND-Funding",
+    "name" : "EU Funds Details Language",
+    "btId" : "BT-6140",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Funding/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-6140-Lot",
     "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-615-Lot",
+    "parentNodeId" : "ND-LotProcurementDocument",
+    "name" : "Documents Restricted URL",
+    "btId" : "BT-615",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cac:Attachment[../cbc:DocumentType/text()='restricted-document']/cac:ExternalReference/cbc:URI",
+    "xpathRelative" : "cac:Attachment[../cbc:DocumentType/text()='restricted-document']/cac:ExternalReference/cbc:URI",
+    "type" : "url",
+    "legalType" : "URL",
     "maxLength" : 400,
     "repeatable" : {
       "value" : false,
@@ -5113,43 +9783,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-LotProcurementDocument} ${not(BT-14-Lot == 'restricted-document')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-510(b)-Organization-Company",
-    "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Streetline 1",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:AdditionalStreetName",
-    "xpathRelative" : "cbc:AdditionalStreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7" ],
+        "condition" : "{ND-LotProcurementDocument} ${not(BT-14-Lot == 'non-restricted-document')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-510(b)-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "Streetline 1",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:AdditionalStreetName",
-    "xpathRelative" : "cbc:AdditionalStreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
+    "id" : "BT-615-Part",
+    "parentNodeId" : "ND-PartProcurementDocument",
+    "name" : "Documents Restricted URL",
+    "btId" : "BT-615",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cac:Attachment[../cbc:DocumentType/text()='restricted-document']/cac:ExternalReference/cbc:URI",
+    "xpathRelative" : "cac:Attachment[../cbc:DocumentType/text()='restricted-document']/cac:ExternalReference/cbc:URI",
+    "type" : "url",
+    "legalType" : "URL",
     "maxLength" : 400,
     "repeatable" : {
       "value" : false,
@@ -5159,44 +9829,40 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartProcurementDocument} ${not(BT-14-Part == 'restricted-document')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-510(b)-UBO",
-    "parentNodeId" : "ND-UBOAddress",
-    "name" : "Streetline 1",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:AdditionalStreetName",
-    "xpathRelative" : "cbc:AdditionalStreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "4", "5", "6" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-510(c)-Organization-Company",
-    "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Streetline 2",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cac:AddressLine/cbc:Line",
-    "xpathRelative" : "cac:AddressLine/cbc:Line",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-625-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Unit",
+    "btId" : "BT-625",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:EstimatedOverallContractQuantity/@unitCode",
+    "xpathRelative" : "cbc:EstimatedOverallContractQuantity/@unitCode",
+    "type" : "code",
+    "attributeName" : "unitCode",
+    "attributeOf" : "BT-25-Lot",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5205,21 +9871,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "measurement-unit",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-510(c)-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "Streetline 2",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cac:AddressLine/cbc:Line",
-    "xpathRelative" : "cac:AddressLine/cbc:Line",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-63-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Variants",
+    "btId" : "BT-63",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:VariantConstraintCode",
+    "xpathRelative" : "cbc:VariantConstraintCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5228,44 +9900,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "permission",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-510(c)-UBO",
-    "parentNodeId" : "ND-UBOAddress",
-    "name" : "Streetline 2",
-    "btId" : "BT-510",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cac:AddressLine/cbc:Line",
-    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "id" : "BT-63-Lot-List",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Variants Listname",
+    "btId" : "BT-63",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:VariantConstraintCode/@listName",
+    "xpathRelative" : "cbc:VariantConstraintCode/@listName",
     "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "attributeName" : "listName",
+    "attributeOf" : "BT-63-Lot",
+    "presetValue" : "permission",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "BT-5101(a)-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance Street",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:StreetName",
-    "xpathRelative" : "cbc:StreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-630(d)-Lot",
+    "parentNodeId" : "ND-InterestExpressionReceptionPeriod",
+    "name" : "Deadline Receipt Expressions",
+    "btId" : "BT-630",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5274,44 +9945,48 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "15", "16", "17", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "20", "21" ],
+        "condition" : "{ND-InterestExpressionReceptionPeriod} ${not(BT-105-Procedure == 'neg-w-call')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-5101(a)-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance Street",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:StreetName",
-    "xpathRelative" : "cbc:StreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "10", "11", "12", "13", "14", "20", "21", "CEI" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-InterestExpressionReceptionPeriod} ${(BT-630(d)-Lot is present) and (BT-05(a)-notice is present)}",
+        "value" : "{ND-InterestExpressionReceptionPeriod} ${BT-630(d)-Lot > BT-05(a)-notice}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00630-0150"
+      } ]
     }
   }, {
-    "id" : "BT-5101(a)-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance Street",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:StreetName",
-    "xpathRelative" : "cbc:StreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-630(t)-Lot",
+    "parentNodeId" : "ND-InterestExpressionReceptionPeriod",
+    "name" : "Deadline Receipt Expressions",
+    "btId" : "BT-630",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod/cbc:EndTime",
+    "xpathRelative" : "cbc:EndTime",
+    "type" : "time",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5320,44 +9995,38 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "15", "16", "17", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "20", "21" ],
+        "condition" : "{ND-InterestExpressionReceptionPeriod} ${BT-630(d)-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-5101(b)-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance Streetline 1",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:AdditionalStreetName",
-    "xpathRelative" : "cbc:AdditionalStreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "10", "11", "12", "13", "14", "20", "21", "CEI" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5101(b)-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance Streetline 1",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:AdditionalStreetName",
-    "xpathRelative" : "cbc:AdditionalStreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-631-Lot",
+    "parentNodeId" : "ND-LotTenderingProcess",
+    "name" : "Dispatch Invitation Interest",
+    "btId" : "BT-631",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationInvitationPeriod/cbc:StartDate",
+    "xpathRelative" : "cac:ParticipationInvitationPeriod/cbc:StartDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5366,41 +10035,31 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-5101(b)-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance Streetline 1",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:AdditionalStreetName",
-    "xpathRelative" : "cbc:AdditionalStreetName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
+        "value" : "{ND-LotTenderingProcess} ${(BT-631-Lot > BT-630(d)-Lot) or not(BT-631-Lot is present) or not(BT-630(d)-Lot is present)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00631-0100"
       } ]
     }
   }, {
-    "id" : "BT-5101(c)-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance Streetline 2",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:AddressLine/cbc:Line",
-    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "id" : "BT-632-Lot",
+    "parentNodeId" : "ND-LotTenderingProcessExtension",
+    "name" : "Tool Name",
+    "btId" : "BT-632",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:AccessToolName",
+    "xpathRelative" : "efbc:AccessToolName",
     "type" : "text",
     "legalType" : "TEXT",
     "maxLength" : 400,
@@ -5412,18 +10071,18 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-5101(c)-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance Streetline 2",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:AddressLine/cbc:Line",
-    "xpathRelative" : "cac:AddressLine/cbc:Line",
+    "id" : "BT-632-Part",
+    "parentNodeId" : "ND-PartTenderingProcessExtension",
+    "name" : "Tool Name",
+    "btId" : "BT-632",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:AccessToolName",
+    "xpathRelative" : "efbc:AccessToolName",
     "type" : "text",
     "legalType" : "TEXT",
     "maxLength" : 400,
@@ -5441,15 +10100,14 @@
       } ]
     }
   }, {
-    "id" : "BT-5101(c)-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance Streetline 2",
-    "btId" : "BT-5101",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:AddressLine/cbc:Line",
-    "xpathRelative" : "cac:AddressLine/cbc:Line",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-633-Organization",
+    "parentNodeId" : "ND-Organization",
+    "name" : "Organisation Natural Person",
+    "btId" : "BT-633",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efbc:NaturalPersonIndicator",
+    "xpathRelative" : "efbc:NaturalPersonIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5458,21 +10116,32 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-Organization} ${not(OPT-200-Organization-Company in /OPT-300-Procedure-SProvider) and not(((OPT-200-Organization-Company in /OPT-301-Tenderer-SubCont) or (OPT-200-Organization-Company in /OPT-300-Tenderer)) and (not(BT-746-Organization == TRUE)))}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-512-Organization-Company",
-    "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Organisation Post Code",
-    "btId" : "BT-512",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:PostalZone",
-    "xpathRelative" : "cbc:PostalZone",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-634-Lot",
+    "parentNodeId" : "ND-LotTenderingProcessExtension",
+    "name" : "Procurement Relaunch",
+    "btId" : "BT-634",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator",
+    "xpathRelative" : "efbc:ProcedureRelaunchIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5481,21 +10150,36 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-LotTenderingProcessExtension} ${((BT-634-Lot == TRUE) and ((BT-142-LotResult== 'clos-nw') or (BT-140-notice == 'cancel'))) or not(BT-634-Lot == TRUE)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00634-0151"
+      } ]
     }
   }, {
-    "id" : "BT-512-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "Post Code",
-    "btId" : "BT-512",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:PostalZone",
-    "xpathRelative" : "cbc:PostalZone",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-634-Procedure",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "Procurement Relaunch",
+    "btId" : "BT-634",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5504,21 +10188,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-ProcedureTenderingProcess} ${((BT-634-Procedure == TRUE) and (not(BT-142-LotResult!= 'clos-nw') or (BT-140-notice == 'cancel'))) or not(BT-634-Procedure == TRUE)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00634-0150"
+      } ]
     }
   }, {
-    "id" : "BT-512-UBO",
-    "parentNodeId" : "ND-UBOAddress",
-    "name" : "Post Code",
-    "btId" : "BT-512",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:PostalZone",
-    "xpathRelative" : "cbc:PostalZone",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-635-LotResult",
+    "parentNodeId" : "ND-ReviewRequestsStatistics",
+    "name" : "Buyer Review Requests Count",
+    "btId" : "BT-635",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efbc:StatisticsNumeric",
+    "xpathRelative" : "efbc:StatisticsNumeric",
+    "type" : "number",
+    "legalType" : "NUMBER",
+    "privacy" : {
+      "code" : "buy-rev-cou",
+      "unpublishedFieldId" : "BT-195(BT-635)-LotResult",
+      "reasonCodeFieldId" : "BT-197(BT-635)-LotResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-635)-LotResult",
+      "publicationDateFieldId" : "BT-198(BT-635)-LotResult"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5527,21 +10233,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-5121-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance Post Code",
-    "btId" : "BT-5121",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:PostalZone",
-    "xpathRelative" : "cbc:PostalZone",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-636-LotResult",
+    "parentNodeId" : "ND-ReviewRequestsStatistics",
+    "name" : "Buyer Review Requests Irregularity Type",
+    "btId" : "BT-636",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efbc:StatisticsCode",
+    "xpathRelative" : "efbc:StatisticsCode",
+    "type" : "code",
+    "legalType" : "CODE",
+    "privacy" : {
+      "code" : "buy-rev-typ",
+      "unpublishedFieldId" : "BT-195(BT-636)-LotResult",
+      "reasonCodeFieldId" : "BT-197(BT-636)-LotResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-636)-LotResult",
+      "publicationDateFieldId" : "BT-198(BT-636)-LotResult"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5550,21 +10262,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "irregularity-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5121-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance Post Code",
-    "btId" : "BT-5121",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:PostalZone",
-    "xpathRelative" : "cbc:PostalZone",
+    "id" : "BT-636-LotResult-List",
+    "parentNodeId" : "ND-ReviewRequestsStatistics",
+    "name" : "Buyer Review Requests Irregularity Type Listname",
+    "btId" : "BT-636",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efbc:StatisticsCode/@listName",
+    "xpathRelative" : "efbc:StatisticsCode/@listName",
     "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "attributeName" : "listName",
+    "attributeOf" : "BT-636-LotResult",
+    "presetValue" : "irregularity-type",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-64-Lot",
+    "parentNodeId" : "ND-SubcontractingObligation",
+    "name" : "Subcontracting Obligation Minimum",
+    "btId" : "BT-64",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']/cbc:MinimumPercent",
+    "xpathRelative" : "cbc:MinimumPercent",
+    "type" : "number",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5573,21 +10307,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-5121-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance Post Code",
-    "btId" : "BT-5121",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:PostalZone",
-    "xpathRelative" : "cbc:PostalZone",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-644-Lot",
+    "parentNodeId" : "ND-Prize",
+    "name" : "Prize Value",
+    "btId" : "BT-644",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:ValueAmount",
+    "xpathRelative" : "cbc:ValueAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5596,21 +10329,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-513-Organization-Company",
-    "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Organisation City",
-    "btId" : "BT-513",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cbc:CityName",
-    "xpathRelative" : "cbc:CityName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-644-Lot-Currency",
+    "parentNodeId" : "ND-Prize",
+    "name" : "Prize Value Currency",
+    "btId" : "BT-644",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:ValueAmount/@currencyID",
+    "xpathRelative" : "cbc:ValueAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-644-Lot",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-currency",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-65-Lot",
+    "parentNodeId" : "ND-SubcontractingObligation",
+    "name" : "Subcontracting Obligation",
+    "btId" : "BT-65",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']/cbc:SubcontractingConditionsCode",
+    "xpathRelative" : "cbc:SubcontractingConditionsCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5619,7 +10373,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -5628,21 +10382,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "18" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "subcontracting-obligation",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-513-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "City",
-    "btId" : "BT-513",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cbc:CityName",
-    "xpathRelative" : "cbc:CityName",
+    "id" : "BT-65-Lot-List",
+    "parentNodeId" : "ND-SubcontractingObligation",
+    "name" : "Subcontracting Obligation Listname",
+    "btId" : "BT-65",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']/cbc:SubcontractingConditionsCode/@listName",
+    "xpathRelative" : "cbc:SubcontractingConditionsCode/@listName",
     "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "attributeName" : "listName",
+    "attributeOf" : "BT-65-Lot",
+    "presetValue" : "subcontracting-obligation",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-651-Lot",
+    "parentNodeId" : "ND-SubcontractingIndication",
+    "name" : "Subcontracting Tender Indication",
+    "btId" : "BT-651",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:TenderSubcontractingRequirements/efbc:TenderSubcontractingRequirementsCode",
+    "xpathRelative" : "efbc:TenderSubcontractingRequirementsCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5651,44 +10427,59 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-513-UBO",
-    "parentNodeId" : "ND-UBOAddress",
-    "name" : "City",
-    "btId" : "BT-513",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cbc:CityName",
-    "xpathRelative" : "cbc:CityName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "18" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "subcontracting-indication",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5131-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance City",
-    "btId" : "BT-5131",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CityName",
-    "xpathRelative" : "cbc:CityName",
+    "id" : "BT-651-Lot-List",
+    "parentNodeId" : "ND-SubcontractingIndication",
+    "name" : "Subcontracting Tender Indication Listname",
+    "btId" : "BT-651",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:TenderSubcontractingRequirements/efbc:TenderSubcontractingRequirementsCode/@listName",
+    "xpathRelative" : "efbc:TenderSubcontractingRequirementsCode/@listName",
     "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "attributeName" : "listName",
+    "attributeOf" : "BT-651-Lot",
+    "presetValue" : "subcontracting-indication",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-660-LotResult",
+    "parentNodeId" : "ND-LotResultFAValues",
+    "name" : "Framework Re-estimated Value",
+    "btId" : "BT-660",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efbc:ReestimatedValueAmount",
+    "xpathRelative" : "efbc:ReestimatedValueAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
+    "privacy" : {
+      "code" : "ree-val",
+      "unpublishedFieldId" : "BT-195(BT-660)-LotResult",
+      "reasonCodeFieldId" : "BT-197(BT-660)-LotResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-660)-LotResult",
+      "publicationDateFieldId" : "BT-198(BT-660)-LotResult"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5697,44 +10488,57 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "28", "32", "35", "36", "37", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "29", "30", "31", "33", "34", "38", "39" ],
+        "condition" : "{ND-LotResultFAValues} ${(BT-13713-LotResult in BT-137-Lot[BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')]) or not(BT-142-LotResult == 'selec-w')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-5131-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance City",
-    "btId" : "BT-5131",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CityName",
-    "xpathRelative" : "cbc:CityName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "29", "30", "31", "33", "34" ],
+        "condition" : "{ND-LotResultFAValues} ${(BT-13713-LotResult in BT-137-Lot[BT-765-Lot in ('fa-mix','fa-w-rc','fa-wo-rc')]) and (BT-142-LotResult == 'selec-w') and (BT-709-LotResult is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-5131-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance City",
-    "btId" : "BT-5131",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:CityName",
-    "xpathRelative" : "cbc:CityName",
-    "type" : "text",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-660-LotResult-Currency",
+    "parentNodeId" : "ND-LotResultFAValues",
+    "name" : "Framework Re-estimated Value Currency",
+    "btId" : "BT-660",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efbc:ReestimatedValueAmount/@currencyID",
+    "xpathRelative" : "efbc:ReestimatedValueAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-660-LotResult",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-currency",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-661-Lot",
+    "parentNodeId" : "ND-SecondStage",
+    "name" : "Maximum Candidates Indicator",
+    "btId" : "BT-661",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList/cbc:LimitationDescription",
+    "xpathRelative" : "cbc:LimitationDescription",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5743,20 +10547,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-514-Organization-Company",
-    "parentNodeId" : "ND-CompanyAddress",
-    "name" : "Organisation Country Code",
-    "btId" : "BT-514",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress/cac:Country/cbc:IdentificationCode",
-    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
+    "id" : "BT-67(a)-Procedure",
+    "parentNodeId" : "ND-ExclusionGrounds",
+    "name" : "Exclusion Grounds",
+    "btId" : "BT-67",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='exclusion-ground']",
+    "xpathRelative" : "cbc:TendererRequirementTypeCode[@listName='exclusion-ground']",
     "type" : "code",
-    "legalType" : "CODE",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5765,7 +10576,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -5774,28 +10585,44 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "16" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-country",
-        "type" : "flat",
-        "parentId" : "country"
+        "id" : "exclusion-ground",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-514-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointAddress",
-    "name" : "Country Code",
-    "btId" : "BT-514",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress/cac:Country/cbc:IdentificationCode",
-    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-67(a)-Procedure-List",
+    "parentNodeId" : "ND-ExclusionGrounds",
+    "name" : "Exclusion Grounds Listname",
+    "btId" : "BT-67",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='exclusion-ground']/@listName",
+    "xpathRelative" : "cbc:TendererRequirementTypeCode[@listName='exclusion-ground']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-67(a)-Procedure",
+    "presetValue" : "exclusion-ground",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-67(b)-Procedure",
+    "parentNodeId" : "ND-ExclusionGrounds",
+    "name" : "Exclusion Grounds",
+    "btId" : "BT-67",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -5804,260 +10631,248 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-ExclusionGrounds} ${BT-67(a)-Procedure is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-country",
-        "type" : "flat",
-        "parentId" : "country"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-514-UBO",
-    "parentNodeId" : "ND-UBOAddress",
-    "name" : "Country Code",
-    "btId" : "BT-514",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress/cac:Country/cbc:IdentificationCode",
-    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
+    "id" : "BT-67(b)-Procedure-Language",
+    "parentNodeId" : "ND-ExclusionGrounds",
+    "name" : "Exclusion Grounds Language",
+    "btId" : "BT-67",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
     "type" : "code",
-    "legalType" : "CODE",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-67(b)-Procedure",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "eforms-country",
-        "type" : "flat",
-        "parentId" : "country"
+        "id" : "eu-official-language",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5141-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance Country Code",
-    "btId" : "BT-5141",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode",
-    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-70-Lot",
+    "parentNodeId" : "ND-ExecutionRequirements",
+    "name" : "Terms Performance",
+    "btId" : "BT-70",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 1000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ExecutionRequirements} ${OPT-060-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "17", "18", "22" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-country",
-        "type" : "flat",
-        "parentId" : "country"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5141-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance Country Code",
-    "btId" : "BT-5141",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode",
-    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
+    "id" : "BT-70-Lot-Language",
+    "parentNodeId" : "ND-ExecutionRequirements",
+    "name" : "Terms Performance Language",
+    "btId" : "BT-70",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
     "type" : "code",
-    "legalType" : "CODE",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-70-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "eforms-country",
-        "type" : "flat",
-        "parentId" : "country"
+        "id" : "eu-official-language",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5141-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance Country Code",
-    "btId" : "BT-5141",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cac:Country/cbc:IdentificationCode",
-    "xpathRelative" : "cac:Country/cbc:IdentificationCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-701-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Identifier",
+    "btId" : "BT-701",
+    "xpathAbsolute" : "/*/cbc:ID[@schemeName='notice-id']",
+    "xpathRelative" : "cbc:ID[@schemeName='notice-id']",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-country",
-        "type" : "flat",
-        "parentId" : "country"
-      },
+    "pattern" : {
+      "value" : "^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-52-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "Successive Reduction Indicator (Lot)",
-    "btId" : "BT-52",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cbc:CandidateReductionConstraintIndicator",
-    "xpathRelative" : "cbc:CandidateReductionConstraintIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-701-notice-Scheme",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Identifier Schemename",
+    "btId" : "BT-701",
+    "xpathAbsolute" : "/*/cbc:ID[@schemeName='notice-id']/@schemeName",
+    "xpathRelative" : "cbc:ID[@schemeName='notice-id']/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-701-notice",
+    "presetValue" : "notice-id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "BT-531-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Additional Nature (different from Main)",
-    "btId" : "BT-531",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='contract-nature']",
-    "xpathRelative" : "cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='contract-nature']",
+    "id" : "BT-702(a)-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Official Language",
+    "btId" : "BT-702",
+    "xpathAbsolute" : "/*/cbc:NoticeLanguageCode",
+    "xpathRelative" : "cbc:NoticeLanguageCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-contract-nature",
+        "id" : "eu-official-language",
         "type" : "flat",
-        "parentId" : "contract-nature"
+        "parentId" : "language"
       },
       "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{ND-Root} ${BT-702(b)-notice is present}",
+        "value" : "{ND-Root} ${not(BT-702(a)-notice in BT-702(b)-notice)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00702-0150"
+      } ]
     }
   }, {
-    "id" : "BT-531-Part",
-    "parentNodeId" : "ND-PartProcurementScope",
-    "name" : "Additional Nature (different from Main)",
-    "btId" : "BT-531",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='contract-nature']",
-    "xpathRelative" : "cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='contract-nature']",
+    "id" : "BT-702(b)-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Official Language",
+    "btId" : "BT-702",
+    "xpathAbsolute" : "/*/cac:AdditionalNoticeLanguage/cbc:ID",
+    "xpathRelative" : "cac:AdditionalNoticeLanguage/cbc:ID",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
       "value" : true,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "eforms-contract-nature",
-        "type" : "flat",
-        "parentId" : "contract-nature"
+        "id" : "eu-official-language",
+        "type" : "flat"
       },
       "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "condition" : "{BT-702(b)-notice} ${BT-702(b)-notice is present}",
+        "value" : "{BT-702(b)-notice} ${BT-702(b)-notice is unique in /BT-702(b)-notice}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00702-0151"
+      } ]
     }
   }, {
-    "id" : "BT-531-Procedure",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
-    "name" : "Additional Nature (different from Main)",
-    "btId" : "BT-531",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[not(@listName='transport-service')]",
-    "xpathRelative" : "cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[not(@listName='transport-service')]",
+    "id" : "BT-706-UBO",
+    "parentNodeId" : "ND-UBONationality",
+    "name" : "Winner Owner Nationality",
+    "btId" : "BT-706",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/efac:Nationality/cbc:NationalityID",
+    "xpathRelative" : "cbc:NationalityID",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-contract-nature",
+        "id" : "eforms-country",
         "type" : "flat",
-        "parentId" : "contract-nature"
+        "parentId" : "country"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-536-Lot",
-    "parentNodeId" : "ND-LotDuration",
-    "name" : "Duration Start Date",
-    "btId" : "BT-536",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:StartDate",
-    "xpathRelative" : "cbc:StartDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-707-Lot",
+    "parentNodeId" : "ND-LotProcurementDocument",
+    "name" : "Documents Restricted Justification",
+    "btId" : "BT-707",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentTypeCode",
+    "xpathRelative" : "cbc:DocumentTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6066,38 +10881,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-LotProcurementDocument} ${not(BT-14-Lot == 'restricted-document')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
+    "mandatory" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-LotDuration} ${((BT-536-Lot is present) and (BT-537-Lot is present) and (BT-536-Lot < BT-537-Lot)) or not((BT-536-Lot is present) and (BT-537-Lot is present))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00536-0150"
-      }, {
-        "condition" : "{ND-LotDuration} ${(BT-71-Lot == 'res-pub-ser') and (BT-536-Lot is present) and (BT-537-Lot is present)}",
-        "value" : "{ND-LotDuration} ${((BT-537-Lot - BT-536-Lot) > P0D) and ((BT-537-Lot - BT-536-Lot) <= P3Y)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00536-0152"
+        "noticeTypes" : [ "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "communication-justification",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-536-Part",
-    "parentNodeId" : "ND-PartDuration",
-    "name" : "Duration Start Date",
-    "btId" : "BT-536",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:StartDate",
-    "xpathRelative" : "cbc:StartDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-707-Part",
+    "parentNodeId" : "ND-PartProcurementDocument",
+    "name" : "Documents Restricted Justification",
+    "btId" : "BT-707",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentTypeCode",
+    "xpathRelative" : "cbc:DocumentTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6109,35 +10927,29 @@
         "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartProcurementDocument} ${not(BT-14-Part == 'restricted-document')}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "communication-justification",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-PartDuration} ${((BT-536-Part is present) and (BT-537-Part is present) and (BT-536-Part < BT-537-Part)) or not((BT-536-Part is present) and (BT-537-Part is present))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00536-0151"
-      }, {
-        "condition" : "{ND-PartDuration} ${(BT-71-Part == 'res-pub-ser') and (BT-536-Part is present) and (BT-537-Part is present)}",
-        "value" : "{ND-PartDuration} ${((BT-537-Part - BT-536-Part) > P0D) and ((BT-537-Part - BT-536-Part) <= P3Y)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00536-0153"
-      } ]
     }
   }, {
-    "id" : "BT-537-Lot",
-    "parentNodeId" : "ND-LotDuration",
-    "name" : "Duration End Date",
-    "btId" : "BT-537",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-708-Lot",
+    "parentNodeId" : "ND-LotDocOfficialLanguage",
+    "name" : "Documents Official Language",
+    "btId" : "BT-708",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages/cac:Language/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6146,24 +10958,33 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "CEI", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-LotProcurementDocument} ${BT-14-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-language",
+        "type" : "flat",
+        "parentId" : "language"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-537-Part",
-    "parentNodeId" : "ND-PartDuration",
-    "name" : "Duration End Date",
-    "btId" : "BT-537",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-708-Part",
+    "parentNodeId" : "ND-PartDocOfficialLanguage",
+    "name" : "Documents Official Language",
+    "btId" : "BT-708",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:OfficialLanguages/cac:Language/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6175,21 +10996,37 @@
         "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartProcurementDocument} ${BT-14-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-language",
+        "type" : "flat",
+        "parentId" : "language"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-538-Lot",
-    "parentNodeId" : "ND-LotDuration",
-    "name" : "Duration Other",
-    "btId" : "BT-538",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode",
-    "xpathRelative" : "cbc:DescriptionCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-709-LotResult",
+    "parentNodeId" : "ND-LotResultFAValues",
+    "name" : "Framework Maximum Value",
+    "btId" : "BT-709",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/cbc:MaximumValueAmount",
+    "xpathRelative" : "cbc:MaximumValueAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
+    "privacy" : {
+      "code" : "max-val",
+      "unpublishedFieldId" : "BT-195(BT-709)-LotResult",
+      "reasonCodeFieldId" : "BT-197(BT-709)-LotResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-709)-LotResult",
+      "publicationDateFieldId" : "BT-198(BT-709)-LotResult"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6198,35 +11035,55 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "CEI", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "28", "32", "35", "36", "37", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "29", "30", "31", "33", "34", "38", "39" ],
+        "condition" : "{ND-LotResultFAValues} ${(BT-13713-LotResult in BT-137-Lot[BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')]) or not(BT-142-LotResult == 'selec-w')}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "29", "30", "31", "33", "34" ],
+        "condition" : "{ND-LotResultFAValues} ${(BT-13713-LotResult in BT-137-Lot[BT-765-Lot in ('fa-mix','fa-w-rc','fa-wo-rc')]) and (BT-142-LotResult == 'selec-w') and (BT-660-LotResult is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-709-LotResult-Currency",
+    "parentNodeId" : "ND-LotResultFAValues",
+    "name" : "Framework Maximum Value Currency",
+    "btId" : "BT-709",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/cbc:MaximumValueAmount/@currencyID",
+    "xpathRelative" : "cbc:MaximumValueAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-709-LotResult",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "duration",
-        "type" : "flat",
-        "parentId" : "timeperiod"
+        "id" : "eforms-currency",
+        "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-LotDuration} ${not(BT-538-Lot == 'UNKNOWN') or (not(BT-03-notice in ('cont-modif','dir-awa-pre') ) and not(BT-137-Lot in BT-13713-LotResult[BT-142-LotResult == 'selec-w']))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00538-0130"
-      } ]
     }
   }, {
-    "id" : "BT-538-Part",
-    "parentNodeId" : "ND-PartDuration",
-    "name" : "Duration Other",
-    "btId" : "BT-538",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DescriptionCode",
-    "xpathRelative" : "cbc:DescriptionCode",
+    "id" : "BT-71-Lot",
+    "parentNodeId" : "ND-LotReservedProcurement",
+    "name" : "Reserved Participation",
+    "btId" : "BT-71",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']/cbc:TendererRequirementTypeCode",
+    "xpathRelative" : "cbc:TendererRequirementTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -6237,35 +11094,52 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "duration",
-        "type" : "flat",
-        "parentId" : "timeperiod"
+        "id" : "reserved-procurement",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-539-Lot",
-    "parentNodeId" : "ND-LotAwardCriterion",
-    "name" : "Award Criterion Type",
-    "btId" : "BT-539",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:AwardingCriterionTypeCode[@listName='award-criterion-type']",
-    "xpathRelative" : "cbc:AwardingCriterionTypeCode[@listName='award-criterion-type']",
+    "id" : "BT-71-Lot-List",
+    "parentNodeId" : "ND-LotReservedProcurement",
+    "name" : "Reserved Participation Listname",
+    "btId" : "BT-71",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']/cbc:TendererRequirementTypeCode/@listName",
+    "xpathRelative" : "cbc:TendererRequirementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-71-Lot",
+    "presetValue" : "reserved-procurement",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-71-Part",
+    "parentNodeId" : "ND-PartReservedProcurement",
+    "name" : "Reserved Participation",
+    "btId" : "BT-71",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']/cbc:TendererRequirementTypeCode",
+    "xpathRelative" : "cbc:TendererRequirementTypeCode",
     "type" : "code",
     "legalType" : "CODE",
-    "privacy" : {
-      "code" : "awa-cri-typ",
-      "unpublishedFieldId" : "BT-195(BT-539)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-539)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-539)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-539)-Lot"
-    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6274,56 +11148,56 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "mandatory" : {
+    "codeList" : {
+      "value" : {
+        "id" : "reserved-procurement",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-717-Lot",
+    "parentNodeId" : "ND-StrategicProcurementLot",
+    "name" : "Clean Vehicles Directive",
+    "btId" : "BT-717",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:StrategicProcurement/efbc:ApplicableLegalBasis",
+    "xpathRelative" : "efbc:ApplicableLegalBasis",
+    "type" : "code",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "29", "31", "32" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "award-criterion-type",
+        "id" : "cvd-scope",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-LotAwardCriteria} ${((BT-5421-Lot == 'ord-imp') and not(BT-5421-Lot != 'ord-imp')) or not(BT-5421-Lot == 'ord-imp')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00539-0194"
-      }, {
-        "condition" : "{ND-LotAwardCriteria} ${BT-541-Lot[BT-5421-Lot == 'ord-imp'] is present}",
-        "value" : "{ND-LotAwardCriteria} ${every number:$ordImp in BT-541-Lot[BT-5421-Lot == 'ord-imp'] satisfies (format-number($ordImp, '#') == string($ordImp))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00539-0196"
-      }, {
-        "condition" : "{ND-LotAwardCriteria} ${BT-541-Lot[BT-5421-Lot == 'ord-imp'] is present}",
-        "value" : "{ND-LotAwardCriteria} ${every number:$ordImp in BT-541-Lot[BT-5421-Lot == 'ord-imp'] satisfies($ordImp <= count(BT-541-Lot[BT-5421-Lot == 'ord-imp']))}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00539-0197"
-      } ]
     }
   }, {
-    "id" : "BT-54-Lot",
-    "parentNodeId" : "ND-OptionsAndRenewals",
-    "name" : "Options Description",
-    "btId" : "BT-54",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cbc:OptionsDescription",
-    "xpathRelative" : "cbc:OptionsDescription",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-7220-Lot",
+    "parentNodeId" : "ND-Funding",
+    "name" : "EU Funds Programme",
+    "btId" : "BT-7220",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Funding/cbc:FundingProgramCode",
+    "xpathRelative" : "cbc:FundingProgramCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6332,28 +11206,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-programme",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-540-Lot",
-    "parentNodeId" : "ND-LotAwardCriterion",
-    "name" : "Award Criterion Description",
-    "btId" : "BT-540",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "privacy" : {
-      "code" : "awa-cri-des",
-      "unpublishedFieldId" : "BT-195(BT-540)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-540)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-540)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-540)-Lot"
-    },
+    "id" : "BT-726-Lot",
+    "parentNodeId" : "ND-LotProcurementScope",
+    "name" : "Suitable For SMEs",
+    "btId" : "BT-726",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:SMESuitableIndicator",
+    "xpathRelative" : "cbc:SMESuitableIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6362,36 +11235,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-LotAwardCriterion} ${(count(BT-5423-Lot[BT-5423-Lot =='min-score']) <= 1) and (count(BT-5423-Lot[BT-5423-Lot =='max-pass']) <= 1)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00540-0150"
-      } ]
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-541-Lot",
-    "parentNodeId" : "ND-LotAwardCriterionParameter",
-    "name" : "Award Criterion Number",
-    "btId" : "BT-541",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter/efbc:ParameterNumeric",
-    "xpathRelative" : "efbc:ParameterNumeric",
-    "type" : "number",
-    "legalType" : "NUMBER",
-    "privacy" : {
-      "code" : "awa-cri-num",
-      "unpublishedFieldId" : "BT-195(BT-541)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-541)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-541)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-541)-Lot"
-    },
+    "id" : "BT-726-Part",
+    "parentNodeId" : "ND-PartProcurementScope",
+    "name" : "Suitable For SMEs",
+    "btId" : "BT-726",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:SMESuitableIndicator",
+    "xpathRelative" : "cbc:SMESuitableIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6400,27 +11264,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5421-Lot",
-    "parentNodeId" : "ND-LotAwardCriterionParameter",
-    "name" : "Award Criterion Number Weight",
-    "btId" : "BT-5421",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter/efbc:ParameterCode[@listName='number-weight']",
-    "xpathRelative" : "efbc:ParameterCode[@listName='number-weight']",
+    "id" : "BT-727-Lot",
+    "parentNodeId" : "ND-LotPerformanceAddress",
+    "name" : "Place Performance Services Other",
+    "btId" : "BT-727",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:Region",
+    "xpathRelative" : "cbc:Region",
     "type" : "code",
     "legalType" : "CODE",
-    "privacy" : {
-      "code" : "awa-cri-wei",
-      "unpublishedFieldId" : "BT-195(BT-5421)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-5421)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-5421)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-5421)-Lot"
-    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6429,44 +11293,32 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-5071-Lot is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "number-weight",
+        "id" : "other-place-service",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-LotAwardCriterionParameter} ${(BT-03-notice in ('result', 'cont-modif', 'dir-awa-pre')) and (BT-5421-Lot is present)}",
-        "value" : "{ND-LotAwardCriterionParameter} ${BT-5421-Lot in ('dec-exa', 'ord-imp', 'per-exa', 'poi-exa')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-05421-0250"
-      } ]
     }
   }, {
-    "id" : "BT-5422-Lot",
-    "parentNodeId" : "ND-LotAwardCriterionParameter",
-    "name" : "Award Criterion Number Fixed",
-    "btId" : "BT-5422",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter/efbc:ParameterCode[@listName='number-fixed']",
-    "xpathRelative" : "efbc:ParameterCode[@listName='number-fixed']",
+    "id" : "BT-727-Part",
+    "parentNodeId" : "ND-PartPerformanceAddress",
+    "name" : "Place Performance Services Other",
+    "btId" : "BT-727",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:Region",
+    "xpathRelative" : "cbc:Region",
     "type" : "code",
     "legalType" : "CODE",
-    "privacy" : {
-      "code" : "awa-cri-fix",
-      "unpublishedFieldId" : "BT-195(BT-5422)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-5422)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-5422)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-5422)-Lot"
-    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6475,34 +11327,32 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-5071-Part is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "number-fixed",
+        "id" : "other-place-service",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-5423-Lot",
-    "parentNodeId" : "ND-LotAwardCriterionParameter",
-    "name" : "Award Criterion Number Threshold",
-    "btId" : "BT-5423",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter/efbc:ParameterCode[@listName='number-threshold']",
-    "xpathRelative" : "efbc:ParameterCode[@listName='number-threshold']",
+    "id" : "BT-727-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformance",
+    "name" : "Place Performance Services Other",
+    "btId" : "BT-727",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:Region",
+    "xpathRelative" : "cbc:Region",
     "type" : "code",
     "legalType" : "CODE",
-    "privacy" : {
-      "code" : "awa-cri-thr",
-      "unpublishedFieldId" : "BT-195(BT-5423)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-5423)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-5423)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-5423)-Lot"
-    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6511,35 +11361,33 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformance} ${BT-5071-Procedure is present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "number-threshold",
+        "id" : "other-place-service",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-543-Lot",
-    "parentNodeId" : "ND-LotAwardCriteria",
-    "name" : "Award Criteria Complicated",
-    "btId" : "BT-543",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cbc:CalculationExpression",
-    "xpathRelative" : "cbc:CalculationExpression",
+    "id" : "BT-728-Lot",
+    "parentNodeId" : "ND-LotPlacePerformance",
+    "name" : "Place Performance Additional Information",
+    "btId" : "BT-728",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cbc:Description",
+    "xpathRelative" : "cbc:Description",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
-    "maxLength" : 1000,
-    "privacy" : {
-      "code" : "awa-cri-com",
-      "unpublishedFieldId" : "BT-195(BT-543)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-543)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-543)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-543)-Lot"
-    },
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6548,30 +11396,54 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-LotPlacePerformance} ${BT-727-Lot is not present and BT-5141-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
+    "mandatory" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-LotAwardCriteria} ${sum(number:BT-541-Lot[BT-5421-Lot == 'per-exa']) == 100 or not(BT-541-Lot[BT-5421-Lot == 'per-exa'] is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00539-0200"
-      }, {
-        "value" : "{ND-LotAwardCriteria} ${sum(number:BT-541-Lot[BT-5421-Lot == 'dec-exa']) == 1 or not(BT-541-Lot[BT-5421-Lot == 'dec-exa'] is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00539-0201"
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02" ],
+        "condition" : "{ND-LotPlacePerformance} ${(BT-727-Lot is not present) and (BT-5071-Lot is not present) and (BT-5131-Lot is not present)}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-57-Lot",
-    "parentNodeId" : "ND-OptionsDescription",
-    "name" : "Renewal Description",
-    "btId" : "BT-57",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cac:Renewal/cac:Period/cbc:Description",
+    "id" : "BT-728-Lot-Language",
+    "parentNodeId" : "ND-LotPlacePerformance",
+    "name" : "Place Performance Additional Information Language",
+    "btId" : "BT-728",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-728-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-728-Part",
+    "parentNodeId" : "ND-PartPlacePerformance",
+    "name" : "Place Performance Additional Information",
+    "btId" : "BT-728",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cbc:Description",
     "xpathRelative" : "cbc:Description",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
@@ -6584,49 +11456,58 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${BT-727-Part is not present and BT-5141-Part is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-578-Lot",
-    "parentNodeId" : "ND-SecurityClearanceTerms",
-    "name" : "Security Clearance",
-    "btId" : "BT-578",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm/cbc:Code",
-    "xpathRelative" : "cbc:Code",
-    "type" : "code",
-    "legalType" : "INDICATOR",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartPlacePerformance} ${(BT-727-Part is not present) and (BT-5071-Part is not present) and (BT-5131-Part is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-728-Part-Language",
+    "parentNodeId" : "ND-PartPlacePerformance",
+    "name" : "Place Performance Additional Information Language",
+    "btId" : "BT-728",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-728-Part",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "required",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-58-Lot",
-    "parentNodeId" : "ND-OptionsAndRenewals",
-    "name" : "Renewal Maximum",
-    "btId" : "BT-58",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cbc:MaximumNumberNumeric",
-    "xpathRelative" : "cbc:MaximumNumberNumeric",
-    "type" : "integer",
-    "legalType" : "NUMBER",
+    "id" : "BT-728-Procedure",
+    "parentNodeId" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "name" : "Place Performance Additional Information",
+    "btId" : "BT-728",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6635,7 +11516,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformanceAdditionalInformation} ${BT-727-Procedure is not present and BT-5141-Procedure is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -6644,20 +11530,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "15", "17", "18" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI" ],
+        "condition" : "{ND-ProcedurePlacePerformanceAdditionalInformation} ${(BT-727-Procedure is not present) and (BT-5071-Procedure is not present) and (BT-5131-Procedure is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-60-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "EU Funds",
-    "btId" : "BT-60",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:FundingProgramCode[@listName='eu-funded']",
-    "xpathRelative" : "cbc:FundingProgramCode[@listName='eu-funded']",
+    "id" : "BT-728-Procedure-Language",
+    "parentNodeId" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "name" : "Place Performance Additional Information Language",
+    "btId" : "BT-728",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
     "type" : "code",
-    "legalType" : "INDICATOR",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-728-Procedure",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-729-Lot",
+    "parentNodeId" : "ND-SubcontractingObligation",
+    "name" : "Subcontracting Obligation Maximum",
+    "btId" : "BT-729",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']/cbc:MaximumPercent",
+    "xpathRelative" : "cbc:MaximumPercent",
+    "type" : "number",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6666,36 +11575,51 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-732-Lot",
+    "parentNodeId" : "ND-SecurityClearanceTerms",
+    "name" : "Security Clearance Description",
+    "btId" : "BT-732",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "7", "10", "16", "19", "23", "29", "32", "36" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eu-funded",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-610-Procedure-Buyer",
-    "parentNodeId" : "ND-ContractingParty",
-    "name" : "Activity Entity",
-    "btId" : "BT-610",
-    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingActivity/cbc:ActivityTypeCode[@listName='entity-activity']",
-    "xpathRelative" : "cac:ContractingActivity/cbc:ActivityTypeCode[@listName='entity-activity']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-733-Lot",
+    "parentNodeId" : "ND-LotAwardCriteria",
+    "name" : "Award Criteria Order Justification",
+    "btId" : "BT-733",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "privacy" : {
+      "code" : "awa-cri-ord",
+      "unpublishedFieldId" : "BT-195(BT-733)-Lot",
+      "reasonCodeFieldId" : "BT-197(BT-733)-Lot",
+      "reasonDescriptionFieldId" : "BT-196(BT-733)-Lot",
+      "publicationDateFieldId" : "BT-198(BT-733)-Lot"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6704,36 +11628,50 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "4", "7", "10", "12", "16", "20", "22", "23", "25", "29", "33", "36", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "mandatory" : {
+    }
+  }, {
+    "id" : "BT-733-Lot-Language",
+    "parentNodeId" : "ND-LotAwardCriteria",
+    "name" : "Award Criteria Order Justification Language",
+    "btId" : "BT-733",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-733-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "2", "5", "8", "11", "15", "17", "24", "30", "37" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "entity-activity",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-6140-Lot",
-    "parentNodeId" : "ND-Funding",
-    "name" : "EU Funds Details",
-    "btId" : "BT-6140",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Funding/cbc:Description",
-    "xpathRelative" : "cbc:Description",
+    "id" : "BT-734-Lot",
+    "parentNodeId" : "ND-LotAwardCriterion",
+    "name" : "Award Criterion Name",
+    "btId" : "BT-734",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:Name",
+    "xpathRelative" : "cbc:Name",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
+    "maxLength" : 400,
+    "privacy" : {
+      "code" : "awa-cri-nam",
+      "unpublishedFieldId" : "BT-195(BT-734)-Lot",
+      "reasonCodeFieldId" : "BT-197(BT-734)-Lot",
+      "reasonDescriptionFieldId" : "BT-196(BT-734)-Lot",
+      "publicationDateFieldId" : "BT-198(BT-734)-Lot"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6742,21 +11680,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-615-Lot",
-    "parentNodeId" : "ND-LotRestrictedDocuments",
-    "name" : "Documents Restricted URL",
-    "btId" : "BT-615",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']/cac:Attachment/cac:ExternalReference/cbc:URI",
-    "xpathRelative" : "cac:Attachment/cac:ExternalReference/cbc:URI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-735-Lot",
+    "parentNodeId" : "ND-StrategicProcurementInformationLot",
+    "name" : "CVD Contract Type",
+    "btId" : "BT-735",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:StrategicProcurement/efac:StrategicProcurementInformation/efbc:ProcurementCategoryCode",
+    "xpathRelative" : "efbc:ProcurementCategoryCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6765,25 +11702,32 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "29", "30", "31", "38", "39", "40" ],
+        "condition" : "{ND-StrategicProcurementInformationLot} ${not(BT-717-Lot == 'true')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+    "codeList" : {
+      "value" : {
+        "id" : "cvd-contract-type",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-615-Part",
-    "parentNodeId" : "ND-PartRestrictedDocuments",
-    "name" : "Documents Restricted URL",
-    "btId" : "BT-615",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']/cac:Attachment/cac:ExternalReference/cbc:URI",
-    "xpathRelative" : "cac:Attachment/cac:ExternalReference/cbc:URI",
-    "type" : "url",
-    "legalType" : "URL",
-    "maxLength" : 400,
+    "id" : "BT-735-LotResult",
+    "parentNodeId" : "ND-StrategicProcurementInformationLotResult",
+    "name" : "CVD Contract Type",
+    "btId" : "BT-735",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efbc:ProcurementCategoryCode",
+    "xpathRelative" : "efbc:ProcurementCategoryCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6792,22 +11736,35 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "29", "30", "31" ],
+        "condition" : "{ND-StrategicProcurementInformationLotResult} ${(BT-13713-LotResult in BT-137-Lot[not(BT-717-Lot == 'true')]) or not(BT-142-LotResult == 'selec-w')}",
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "38", "39", "40" ],
+        "condition" : "{ND-StrategicProcurementInformationLotResult} ${BT-13713-LotResult == BT-137-Lot[not(BT-717-Lot == 'true')]}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+    "codeList" : {
+      "value" : {
+        "id" : "cvd-contract-type",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-625-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Unit",
-    "btId" : "BT-625",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:EstimatedOverallContractQuantity/@unitCode",
-    "xpathRelative" : "cbc:EstimatedOverallContractQuantity/@unitCode",
+    "id" : "BT-736-Lot",
+    "parentNodeId" : "ND-LotReservedExecution",
+    "name" : "Reserved Execution",
+    "btId" : "BT-736",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']/cbc:ExecutionRequirementCode",
+    "xpathRelative" : "cbc:ExecutionRequirementCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -6818,25 +11775,34 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "CEI" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "measurement-unit",
+        "id" : "reserved-execution",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-63-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Variants",
-    "btId" : "BT-63",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:VariantConstraintCode",
-    "xpathRelative" : "cbc:VariantConstraintCode",
+    "id" : "BT-736-Part",
+    "parentNodeId" : "ND-PartReservedExecution",
+    "name" : "Reserved Execution",
+    "btId" : "BT-736",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']/cbc:ExecutionRequirementCode",
+    "xpathRelative" : "cbc:ExecutionRequirementCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -6847,27 +11813,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "permission",
+        "id" : "reserved-execution",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-630(d)-Lot",
-    "parentNodeId" : "ND-InterestExpressionReceptionPeriod",
-    "name" : "Deadline Receipt Expressions",
-    "btId" : "BT-630",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-737-Lot",
+    "parentNodeId" : "ND-LotDocNonOfficialLanguage",
+    "name" : "Documents Unofficial Language",
+    "btId" : "BT-737",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages/cac:Language/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6876,43 +11842,32 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "15", "16", "17", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "10", "11", "12", "13", "14", "CEI" ],
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-LotProcurementDocument} ${BT-14-Lot is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-InterestExpressionReceptionPeriod} ${(BT-630(d)-Lot is present) and (BT-05(a)-notice is present)}",
-        "value" : "{ND-InterestExpressionReceptionPeriod} ${BT-630(d)-Lot > BT-05(a)-notice}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00630-0150"
-      } ]
     }
   }, {
-    "id" : "BT-630(t)-Lot",
-    "parentNodeId" : "ND-InterestExpressionReceptionPeriod",
-    "name" : "Deadline Receipt Expressions",
-    "btId" : "BT-630",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod/cbc:EndTime",
-    "xpathRelative" : "cbc:EndTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "BT-737-Part",
+    "parentNodeId" : "ND-PartDocNonOfficialLanguage",
+    "name" : "Documents Unofficial Language",
+    "btId" : "BT-737",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NonOfficialLanguages/cac:Language/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6921,69 +11876,60 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "15", "16", "17", "18", "19", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "10", "11", "12", "13", "14", "CEI" ],
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartProcurementDocument} ${BT-14-Part is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-631-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "Dispatch Invitation Interest",
-    "btId" : "BT-631",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationInvitationPeriod/cbc:StartDate",
-    "xpathRelative" : "cac:ParticipationInvitationPeriod/cbc:StartDate",
+    "id" : "BT-738-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Preferred Publication Date",
+    "btId" : "BT-738",
+    "xpathAbsolute" : "/*/cbc:RequestedPublicationDate",
+    "xpathRelative" : "cbc:RequestedPublicationDate",
     "type" : "date",
     "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+      "severity" : "ERROR"
     },
     "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
       "severity" : "ERROR"
     },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-LotTenderingProcess} ${(BT-631-Lot > BT-630(d)-Lot) or not(BT-631-Lot is present) or not(BT-630(d)-Lot is present)}",
+        "condition" : "{ND-Root} ${BT-738-notice is present}",
+        "value" : "{ND-Root} ${((BT-738-notice - BT-05(a)-notice) < P60D) and ((BT-738-notice - BT-05(a)-notice) >= P0D)}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00631-0100"
+        "message" : "rule|text|BR-BT-00738-0053"
       } ]
     }
   }, {
-    "id" : "BT-632-Lot",
-    "parentNodeId" : "ND-LotTenderingProcessExtension",
-    "name" : "Tool Name",
-    "btId" : "BT-632",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:AccessToolName",
-    "xpathRelative" : "efbc:AccessToolName",
-    "type" : "text",
+    "id" : "BT-739-Organization-Company",
+    "parentNodeId" : "ND-CompanyContact",
+    "name" : "Organisation Contact Fax",
+    "btId" : "BT-739",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:Telefax",
+    "xpathRelative" : "cbc:Telefax",
+    "type" : "phone",
     "legalType" : "TEXT",
-    "maxLength" : 400,
+    "maxLength" : 30,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -6992,21 +11938,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-632-Part",
-    "parentNodeId" : "ND-PartTenderingProcessExtension",
-    "name" : "Tool Name",
-    "btId" : "BT-632",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:AccessToolName",
-    "xpathRelative" : "efbc:AccessToolName",
-    "type" : "text",
+    "id" : "BT-739-Organization-TouchPoint",
+    "parentNodeId" : "ND-TouchpointContact",
+    "name" : "Contact Fax",
+    "btId" : "BT-739",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:Telefax",
+    "xpathRelative" : "cbc:Telefax",
+    "type" : "phone",
     "legalType" : "TEXT",
-    "maxLength" : 400,
+    "maxLength" : 30,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7015,20 +11965,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-633-Organization",
-    "parentNodeId" : "ND-Organization",
-    "name" : "Organisation Natural Person",
-    "btId" : "BT-633",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efbc:NaturalPersonIndicator",
-    "xpathRelative" : "efbc:NaturalPersonIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-739-UBO",
+    "parentNodeId" : "ND-UBOContact",
+    "name" : "UBO Contact Fax",
+    "btId" : "BT-739",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact/cbc:Telefax",
+    "xpathRelative" : "cbc:Telefax",
+    "type" : "phone",
+    "legalType" : "TEXT",
+    "maxLength" : 30,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7037,19 +11992,23 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-634-Lot",
-    "parentNodeId" : "ND-LotTenderingProcessExtension",
-    "name" : "Procurement Relaunch",
-    "btId" : "BT-634",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator",
-    "xpathRelative" : "efbc:ProcedureRelaunchIndicator",
-    "type" : "indicator",
+    "id" : "BT-740-Procedure-Buyer",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Buyer Contracting Entity",
+    "btId" : "BT-740",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-contracting-type']",
+    "xpathRelative" : "cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-contracting-type']",
+    "type" : "code",
     "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
@@ -7059,29 +12018,67 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "4", "5", "7", "8", "10", "11", "12", "13", "15", "16", "17", "20", "21", "22", "23", "24", "25", "26", "29", "30", "33", "34", "36", "37", "38", "39", "40", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "14", "19", "32", "35", "CEI", "T01", "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
+    "codeList" : {
+      "value" : {
+        "id" : "buyer-contracting-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-LotTenderingProcessExtension} ${((BT-634-Lot == TRUE) and ((BT-142-LotResult== 'clos-nw') or (BT-140-notice == 'cancel'))) or not(BT-634-Lot == TRUE)}",
+        "condition" : "{ND-ContractingParty} ${(OPP-070-notice in ('3','6','9','CEI','14','18','19','22','27','28','31','32','35','40')) and (BT-11-Procedure-Buyer in ('pub-undert', 'pub-undert-cga', 'pub-undert-ra', 'pub-undert-la', 'spec-rights-entity')) and not(BT-02-notice == 'can-modif') and (BT-740-Procedure-Buyer is present)}",
+        "value" : "{ND-ContractingParty} ${BT-740-Procedure-Buyer == 'cont-ent'}",
         "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00634-0151"
+        "message" : "rule|text|BR-BT-00740-0100"
+      }, {
+        "condition" : "{ND-ContractingParty} ${(OPP-070-notice in ('3','6','9','CEI','14','18','19','22','27','28','31','32','35','40')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la', 'eu-ins-bod-ag', 'def-cont', 'int-org')) and not(BT-02-notice == 'can-modif') and (BT-740-Procedure-Buyer is present)}",
+        "value" : "{ND-ContractingParty} ${BT-740-Procedure-Buyer == 'not-cont-ent'}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00740-0101"
       } ]
     }
   }, {
-    "id" : "BT-634-Procedure",
-    "parentNodeId" : "ND-ProcedureTenderingProcess",
-    "name" : "Procurement Relaunch",
-    "btId" : "BT-634",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator",
-    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:ProcedureRelaunchIndicator",
-    "type" : "indicator",
+    "id" : "BT-740-Procedure-Buyer-List",
+    "parentNodeId" : "ND-ContractingParty",
+    "name" : "Buyer Contracting Entity Listname",
+    "btId" : "BT-740",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-contracting-type']/@listName",
+    "xpathRelative" : "cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-contracting-type']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-740-Procedure-Buyer",
+    "presetValue" : "buyer-contracting-type",
     "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-743-Lot",
+    "parentNodeId" : "ND-LotEInvoicing",
+    "name" : "Electronic Invoicing",
+    "btId" : "BT-743",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='einvoicing']/cbc:ExecutionRequirementCode",
+    "xpathRelative" : "cbc:ExecutionRequirementCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7090,29 +12087,52 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
+    "mandatory" : {
+      "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "value" : "{ND-ProcedureTenderingProcess} ${((BT-634-Procedure == TRUE) and (not(BT-142-LotResult!= 'clos-nw') or (BT-140-notice == 'cancel'))) or not(BT-634-Procedure == TRUE)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00634-0150"
+        "noticeTypes" : [ "16" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "einvoicing",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-64-Lot",
-    "parentNodeId" : "ND-SubcontractTerms",
-    "name" : "Subcontracting Obligation Minimum",
-    "btId" : "BT-64",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms/cbc:MinimumPercent",
-    "xpathRelative" : "cbc:MinimumPercent",
-    "type" : "number",
-    "legalType" : "NUMBER",
+    "id" : "BT-743-Lot-List",
+    "parentNodeId" : "ND-LotEInvoicing",
+    "name" : "Electronic Invoicing Listname",
+    "btId" : "BT-743",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='einvoicing']/cbc:ExecutionRequirementCode/@listName",
+    "xpathRelative" : "cbc:ExecutionRequirementCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-743-Lot",
+    "presetValue" : "einvoicing",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-744-Lot",
+    "parentNodeId" : "ND-LotESignature",
+    "name" : "Submission Electronic Signature",
+    "btId" : "BT-744",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='esignature-submission']/cbc:ExecutionRequirementCode",
+    "xpathRelative" : "cbc:ExecutionRequirementCode",
+    "type" : "code",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7121,20 +12141,44 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "esignature-submission",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-644-Lot",
-    "parentNodeId" : "ND-Prize",
-    "name" : "Prize Value",
-    "btId" : "BT-644",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize/cbc:ValueAmount",
-    "xpathRelative" : "cbc:ValueAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
+    "id" : "BT-744-Lot-List",
+    "parentNodeId" : "ND-LotESignature",
+    "name" : "Submission Electronic Signature Listname",
+    "btId" : "BT-744",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='esignature-submission']/cbc:ExecutionRequirementCode/@listName",
+    "xpathRelative" : "cbc:ExecutionRequirementCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-744-Lot",
+    "presetValue" : "esignature-submission",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-745-Lot",
+    "parentNodeId" : "ND-NonEsubmission",
+    "name" : "Submission Nonelectronic Description",
+    "btId" : "BT-745",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7143,20 +12187,57 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-NonEsubmission} ${BT-17-Lot == 'required'}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24" ],
+        "condition" : "{ND-NonEsubmission} ${BT-17-Lot == 'not-allowed'}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-65-Lot",
-    "parentNodeId" : "ND-SubcontractingObligation",
-    "name" : "Subcontracting Obligation",
-    "btId" : "BT-65",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']/cbc:SubcontractingConditionsCode",
-    "xpathRelative" : "cbc:SubcontractingConditionsCode",
+    "id" : "BT-745-Lot-Language",
+    "parentNodeId" : "ND-NonEsubmission",
+    "name" : "Submission Nonelectronic Description Language",
+    "btId" : "BT-745",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
     "type" : "code",
-    "legalType" : "CODE",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-745-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-746-Organization",
+    "parentNodeId" : "ND-Organization",
+    "name" : "Winner Listed",
+    "btId" : "BT-746",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efbc:ListedOnRegulatedMarketIndicator",
+    "xpathRelative" : "efbc:ListedOnRegulatedMarketIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7165,7 +12246,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-Organization} ${not(OPT-200-Organization-Company in OPT-300-Tenderer) and not(OPT-200-Organization-Company in OPT-301-Tenderer-SubCont)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -7174,36 +12260,37 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "18" ],
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-Organization} ${(OPT-200-Organization-Company in OPT-300-Tenderer[OPT-210-Tenderer in OPT-310-Tender[OPT-321-Tender in BT-3202-Contract]]) or (OPT-200-Organization-Company in OPT-301-Tenderer-SubCont[OPT-210-Tenderer in OPT-310-Tender[OPT-321-Tender in BT-3202-Contract]])}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "subcontracting-obligation",
+        "id" : "indicator",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-651-Lot",
-    "parentNodeId" : "ND-NonUBLTenderingTerms",
-    "name" : "Subcontracting Tender Indication",
-    "btId" : "BT-651",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:TenderSubcontractingRequirements/efbc:TenderSubcontractingRequirementsCode",
-    "xpathRelative" : "efac:TenderSubcontractingRequirements/efbc:TenderSubcontractingRequirementsCode",
+    "id" : "BT-747-Lot",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Type",
+    "btId" : "BT-747",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:CriterionTypeCode[@listName='selection-criterion']",
+    "xpathRelative" : "cbc:CriterionTypeCode[@listName='selection-criterion']",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -7212,49 +12299,56 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "18" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "subcontracting-indication",
+        "id" : "selection-criterion",
         "type" : "flat"
       },
       "severity" : "ERROR"
+    },
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "value" : "{ND-NonUBLTenderingTerms} ${sum(number:BT-752-Lot-WeightNumber[BT-7531-Lot == 'per-exa']) == 100 or not(BT-752-Lot-WeightNumber[BT-7531-Lot == 'per-exa'] is present)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00747-0100"
+      }, {
+        "value" : "{ND-NonUBLTenderingTerms} ${sum(number:BT-752-Lot-WeightNumber[BT-7531-Lot == 'dec-exa']) == 1 or not(BT-752-Lot-WeightNumber[BT-7531-Lot == 'dec-exa'] is present)}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00747-0101"
+      } ]
     }
   }, {
-    "id" : "BT-661-Lot",
-    "parentNodeId" : "ND-SecondStage",
-    "name" : "Maximum Candidates Indicator",
-    "btId" : "BT-661",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList/cbc:LimitationDescription",
-    "xpathRelative" : "cbc:LimitationDescription",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-747-Lot-List",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Type Listname",
+    "btId" : "BT-747",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:CriterionTypeCode[@listName='selection-criterion']/@listName",
+    "xpathRelative" : "cbc:CriterionTypeCode[@listName='selection-criterion']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-747-Lot",
+    "presetValue" : "selection-criterion",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "BT-67(a)-Procedure",
-    "parentNodeId" : "ND-ExclusionGrounds",
-    "name" : "Exclusion Grounds",
-    "btId" : "BT-67",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='exclusion-ground']",
-    "xpathRelative" : "cbc:TendererRequirementTypeCode[@listName='exclusion-ground']",
+    "id" : "BT-748-Lot",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Used",
+    "btId" : "BT-748",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:CalculationExpressionCode[@listName='usage']",
+    "xpathRelative" : "cbc:CalculationExpressionCode[@listName='usage']",
     "type" : "code",
-    "legalType" : "TEXT",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7268,64 +12362,48 @@
         "severity" : "ERROR"
       } ]
     },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "16" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "exclusion-ground",
+        "id" : "usage",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-67(b)-Procedure",
-    "parentNodeId" : "ND-ExclusionGrounds",
-    "name" : "Exclusion Grounds",
-    "btId" : "BT-67",
-    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
+    "assert" : {
+      "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
+        "value" : "{ND-SelectionCriteria} ${((BT-748-Lot == 'nyk') and (OPP-070-notice in ('7','8','9','10','11','12','13','14'))) or not(BT-748-Lot == 'nyk')}",
+        "severity" : "ERROR",
+        "message" : "rule|text|BR-BT-00748-0100"
       } ]
-    },
-    "mandatory" : {
+    }
+  }, {
+    "id" : "BT-748-Lot-List",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Used Listname",
+    "btId" : "BT-748",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:CalculationExpressionCode[@listName='usage']/@listName",
+    "xpathRelative" : "cbc:CalculationExpressionCode[@listName='usage']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-748-Lot",
+    "presetValue" : "usage",
+    "legalType" : "CODE",
+    "repeatable" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "16" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-70-Lot",
-    "parentNodeId" : "ND-ExecutionRequirements",
-    "name" : "Terms Performance",
-    "btId" : "BT-70",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']/cbc:Description",
-    "xpathRelative" : "cbc:Description",
+    "id" : "BT-749-Lot",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Name",
+    "btId" : "BT-749",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:Name",
+    "xpathRelative" : "cbc:Name",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
-    "maxLength" : 1000,
+    "maxLength" : 400,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7334,97 +12412,69 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "17", "18", "22" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-701-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Identifier",
-    "btId" : "BT-701",
-    "xpathAbsolute" : "/*/cbc:ID[@schemeName='notice-id']",
-    "xpathRelative" : "cbc:ID[@schemeName='notice-id']",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-749-Lot-Language",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Name Language",
+    "btId" : "BT-749",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:Name/@languageID",
+    "xpathRelative" : "cbc:Name/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-749-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "pattern" : {
-      "value" : "^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-702(a)-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Official Language",
-    "btId" : "BT-702",
-    "xpathAbsolute" : "/*/cbc:NoticeLanguageCode",
-    "xpathRelative" : "cbc:NoticeLanguageCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-75-Lot",
+    "parentNodeId" : "ND-FinancialGuarantee",
+    "name" : "Guarantee Required Description",
+    "btId" : "BT-75",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eu-official-language",
-        "type" : "flat",
-        "parentId" : "language"
-      },
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-Root} ${BT-702(b)-notice is present}",
-        "value" : "{ND-Root} ${not(BT-702(a)-notice in BT-702(b)-notice)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00702-0150"
-      } ]
     }
   }, {
-    "id" : "BT-702(b)-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Official Language",
-    "btId" : "BT-702",
-    "xpathAbsolute" : "/*/cac:AdditionalNoticeLanguage/cbc:ID",
-    "xpathRelative" : "cac:AdditionalNoticeLanguage/cbc:ID",
+    "id" : "BT-75-Lot-Language",
+    "parentNodeId" : "ND-FinancialGuarantee",
+    "name" : "Guarantee Required Description Language",
+    "btId" : "BT-75",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
     "type" : "code",
-    "legalType" : "CODE",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-75-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "codeList" : {
@@ -7433,56 +12483,61 @@
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{BT-702(b)-notice} ${BT-702(b)-notice is present}",
-        "value" : "{BT-702(b)-notice} ${BT-702(b)-notice is unique in /BT-702(b)-notice}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00702-0151"
-      } ]
     }
   }, {
-    "id" : "BT-706-UBO",
-    "parentNodeId" : "ND-UBO",
-    "name" : "Winner Owner Nationality",
-    "btId" : "BT-706",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/efac:Nationality/cbc:NationalityID",
-    "xpathRelative" : "efac:Nationality/cbc:NationalityID",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-750-Lot",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Description",
+    "btId" : "BT-750",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-750-Lot-Language",
+    "parentNodeId" : "ND-SelectionCriteria",
+    "name" : "Selection Criteria Description Language",
+    "btId" : "BT-750",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-750-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-country",
-        "type" : "flat",
-        "parentId" : "country"
+        "id" : "eu-official-language",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-707-Lot",
-    "parentNodeId" : "ND-LotRestrictedDocuments",
-    "name" : "Documents Restricted Justification",
-    "btId" : "BT-707",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']/cbc:DocumentTypeCode",
-    "xpathRelative" : "cbc:DocumentTypeCode",
+    "id" : "BT-751-Lot",
+    "parentNodeId" : "ND-FinancialGuarantee",
+    "name" : "Guarantee Required",
+    "btId" : "BT-751",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee/cbc:GuaranteeTypeCode[@listName='tender-guarantee-required']",
+    "xpathRelative" : "cbc:GuaranteeTypeCode[@listName='tender-guarantee-required']",
     "type" : "code",
-    "legalType" : "CODE",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7491,27 +12546,52 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "17", "18", "22" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "communication-justification",
+        "id" : "tender-guarantee-required",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-707-Part",
-    "parentNodeId" : "ND-PartRestrictedDocuments",
-    "name" : "Documents Restricted Justification",
-    "btId" : "BT-707",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference[cbc:DocumentType/text()='restricted-document']/cbc:DocumentTypeCode",
-    "xpathRelative" : "cbc:DocumentTypeCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-751-Lot-List",
+    "parentNodeId" : "ND-FinancialGuarantee",
+    "name" : "Guarantee Required Listname",
+    "btId" : "BT-751",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee/cbc:GuaranteeTypeCode[@listName='tender-guarantee-required']/@listName",
+    "xpathRelative" : "cbc:GuaranteeTypeCode[@listName='tender-guarantee-required']/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-751-Lot",
+    "presetValue" : "tender-guarantee-required",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-752-Lot-ThresholdNumber",
+    "parentNodeId" : "ND-SecondStageThresholdCriterionParameter",
+    "name" : "Selection Criteria Second Stage Invite Threshold Number",
+    "btId" : "BT-752",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efbc:ParameterNumeric",
+    "xpathRelative" : "efbc:ParameterNumeric",
+    "type" : "number",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7520,27 +12600,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "communication-justification",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-708-Lot",
-    "parentNodeId" : "ND-LotProcurementDocument",
-    "name" : "Documents Official Language",
-    "btId" : "BT-708",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:LanguageID[not(../cbc:DocumentStatusCode/text()='non-official')]",
-    "xpathRelative" : "cbc:LanguageID[not(../cbc:DocumentStatusCode/text()='non-official')]",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-752-Lot-WeightNumber",
+    "parentNodeId" : "ND-SecondStageWeightCriterionParameter",
+    "name" : "Selection Criteria Second Stage Invite Weight Number",
+    "btId" : "BT-752",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-weight']/efbc:ParameterNumeric",
+    "xpathRelative" : "efbc:ParameterNumeric",
+    "type" : "number",
+    "legalType" : "NUMBER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7549,26 +12622,18 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "eforms-language",
-        "type" : "flat",
-        "parentId" : "language"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-708-Part",
-    "parentNodeId" : "ND-PartProcurementDocument",
-    "name" : "Documents Official Language",
-    "btId" : "BT-708",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:LanguageID[not(../cbc:DocumentStatusCode/text()='non-official')]",
-    "xpathRelative" : "cbc:LanguageID[not(../cbc:DocumentStatusCode/text()='non-official')]",
+    "id" : "BT-7531-Lot",
+    "parentNodeId" : "ND-SecondStageWeightCriterionParameter",
+    "name" : "Selection Criteria Second Stage Invite Number Weight",
+    "btId" : "BT-7531",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-weight']/efbc:ParameterCode",
+    "xpathRelative" : "efbc:ParameterCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -7579,26 +12644,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-language",
-        "type" : "flat",
-        "parentId" : "language"
+        "id" : "number-weight",
+        "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-71-Lot",
-    "parentNodeId" : "ND-LotReservedProcurement",
-    "name" : "Reserved Participation",
-    "btId" : "BT-71",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']/cbc:TendererRequirementTypeCode[@listName='reserved-procurement']",
-    "xpathRelative" : "cbc:TendererRequirementTypeCode[@listName='reserved-procurement']",
+    "id" : "BT-7531-Lot-List",
+    "parentNodeId" : "ND-SecondStageWeightCriterionParameter",
+    "name" : "Selection Criteria Second Stage Invite Number Weight Listname",
+    "btId" : "BT-7531",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-weight']/efbc:ParameterCode/@listName",
+    "xpathRelative" : "efbc:ParameterCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-7531-Lot",
+    "presetValue" : "number-weight",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-7532-Lot",
+    "parentNodeId" : "ND-SecondStageThresholdCriterionParameter",
+    "name" : "Selection Criteria Second Stage Invite Number Threshold",
+    "btId" : "BT-7532",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efbc:ParameterCode",
+    "xpathRelative" : "efbc:ParameterCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -7609,34 +12689,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "reserved-procurement",
+        "id" : "number-threshold",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-71-Part",
-    "parentNodeId" : "ND-PartReservedProcurement",
-    "name" : "Reserved Participation",
-    "btId" : "BT-71",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']/cbc:TendererRequirementTypeCode[@listName='reserved-procurement']",
-    "xpathRelative" : "cbc:TendererRequirementTypeCode[@listName='reserved-procurement']",
+    "id" : "BT-7532-Lot-List",
+    "parentNodeId" : "ND-SecondStageThresholdCriterionParameter",
+    "name" : "Selection Criteria Second Stage Invite Number Threshold Listname",
+    "btId" : "BT-7532",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efbc:ParameterCode/@listName",
+    "xpathRelative" : "efbc:ParameterCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-7532-Lot",
+    "presetValue" : "number-threshold",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-754-Lot",
+    "parentNodeId" : "ND-AccessibilityJustification",
+    "name" : "Accessibility",
+    "btId" : "BT-754",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -7647,27 +12734,44 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "reserved-procurement",
+        "id" : "accessibility",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-717-Lot",
-    "parentNodeId" : "ND-StrategicProcurementLot",
-    "name" : "Clean Vehicles Directive",
-    "btId" : "BT-717",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:StrategicProcurement/efbc:ApplicableLegalBasis",
-    "xpathRelative" : "efbc:ApplicableLegalBasis",
-    "type" : "code",
-    "legalType" : "INDICATOR",
+    "id" : "BT-754-Lot-List",
+    "parentNodeId" : "ND-AccessibilityJustification",
+    "name" : "Accessibility Listname",
+    "btId" : "BT-754",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-754-Lot",
+    "presetValue" : "accessibility",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-755-Lot",
+    "parentNodeId" : "ND-AccessibilityJustification",
+    "name" : "Accessibility Justification",
+    "btId" : "BT-755",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']/cbc:ProcurementType",
+    "xpathRelative" : "cbc:ProcurementType",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7676,27 +12780,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-755-Lot-Language",
+    "parentNodeId" : "ND-AccessibilityJustification",
+    "name" : "Accessibility Justification Language",
+    "btId" : "BT-755",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']/cbc:ProcurementType/@languageID",
+    "xpathRelative" : "cbc:ProcurementType/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-755-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "cvd-scope",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-7220-Lot",
-    "parentNodeId" : "ND-Funding",
-    "name" : "EU Funds Programme",
-    "btId" : "BT-7220",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Funding/cbc:FundingProgramCode",
-    "xpathRelative" : "cbc:FundingProgramCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-756-Procedure",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "PIN Competition Termination",
+    "btId" : "BT-756",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:TerminatedIndicator",
+    "xpathRelative" : "cbc:TerminatedIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7705,49 +12824,77 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "31", "32", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eu-programme",
+        "id" : "indicator",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-726-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Suitable For SMEs",
-    "btId" : "BT-726",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cbc:SMESuitableIndicator",
-    "xpathRelative" : "cbc:SMESuitableIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-757-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Version",
+    "btId" : "BT-757",
+    "xpathAbsolute" : "/*/cbc:VersionID",
+    "xpathRelative" : "cbc:VersionID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^(0[1-9]|[1-9]\\d)$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-726-Part",
-    "parentNodeId" : "ND-PartProcurementScope",
-    "name" : "Suitable For SMEs",
-    "btId" : "BT-726",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cbc:SMESuitableIndicator",
-    "xpathRelative" : "cbc:SMESuitableIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-758-notice",
+    "parentNodeId" : "ND-Changes",
+    "name" : "Change Notice Version Identifier",
+    "btId" : "BT-758",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efbc:ChangedNoticeIdentifier",
+    "xpathRelative" : "efbc:ChangedNoticeIdentifier",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "pattern" : {
+      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|(\\d{1,8})-(19|20)\\d\\d)$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-759-LotResult",
+    "parentNodeId" : "ND-ReceivedSubmissions",
+    "name" : "Received Submissions Count",
+    "btId" : "BT-759",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efbc:StatisticsNumeric",
+    "xpathRelative" : "efbc:StatisticsNumeric",
+    "type" : "number",
+    "legalType" : "NUMBER",
+    "privacy" : {
+      "code" : "rec-sub-cou",
+      "unpublishedFieldId" : "BT-195(BT-759)-LotResult",
+      "reasonCodeFieldId" : "BT-197(BT-759)-LotResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-759)-LotResult",
+      "publicationDateFieldId" : "BT-198(BT-759)-LotResult"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7756,20 +12903,21 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-727-Lot",
-    "parentNodeId" : "ND-LotPerformanceAddress",
-    "name" : "Place Performance Services Other",
-    "btId" : "BT-727",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:Region",
-    "xpathRelative" : "cbc:Region",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-76-Lot",
+    "parentNodeId" : "ND-TendererLegalForm",
+    "name" : "Tenderer Legal Form Description",
+    "btId" : "BT-76",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]/cbc:CompanyLegalForm",
+    "xpathRelative" : "cbc:CompanyLegalForm",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7778,27 +12926,49 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-76-Lot-Language",
+    "parentNodeId" : "ND-TendererLegalForm",
+    "name" : "Tenderer Legal Form Description Language",
+    "btId" : "BT-76",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]/cbc:CompanyLegalForm/@languageID",
+    "xpathRelative" : "cbc:CompanyLegalForm/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-76-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "other-place-service",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-727-Part",
-    "parentNodeId" : "ND-PartPerformanceAddress",
-    "name" : "Place Performance Services Other",
-    "btId" : "BT-727",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:Region",
-    "xpathRelative" : "cbc:Region",
+    "id" : "BT-760-LotResult",
+    "parentNodeId" : "ND-ReceivedSubmissions",
+    "name" : "Received Submissions Type",
+    "btId" : "BT-760",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efbc:StatisticsCode",
+    "xpathRelative" : "efbc:StatisticsCode",
     "type" : "code",
     "legalType" : "CODE",
+    "privacy" : {
+      "code" : "rec-sub-typ",
+      "unpublishedFieldId" : "BT-195(BT-760)-LotResult",
+      "reasonCodeFieldId" : "BT-197(BT-760)-LotResult",
+      "reasonDescriptionFieldId" : "BT-196(BT-760)-LotResult",
+      "publicationDateFieldId" : "BT-198(BT-760)-LotResult"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7807,27 +12977,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "other-place-service",
+        "id" : "received-submission-type",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-727-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformance",
-    "name" : "Place Performance Services Other",
-    "btId" : "BT-727",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address/cbc:Region",
-    "xpathRelative" : "cbc:Region",
-    "type" : "code",
+    "id" : "BT-760-LotResult-List",
+    "parentNodeId" : "ND-ReceivedSubmissions",
+    "name" : "Received Submissions Type Listname",
+    "btId" : "BT-760",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efbc:StatisticsCode/@listName",
+    "xpathRelative" : "efbc:StatisticsCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-760-LotResult",
+    "presetValue" : "received-submission-type",
     "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-761-Lot",
+    "parentNodeId" : "ND-TendererLegalForm",
+    "name" : "Tenderer Legal Form",
+    "btId" : "BT-761",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]/cbc:CompanyLegalFormCode",
+    "xpathRelative" : "cbc:CompanyLegalFormCode",
+    "type" : "code",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7836,25 +13022,50 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "17", "18" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "other-place-service",
+        "id" : "required",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-728-Lot",
-    "parentNodeId" : "ND-LotPlacePerformance",
-    "name" : "Place Performance Additional Information",
-    "btId" : "BT-728",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cbc:Description",
-    "xpathRelative" : "cbc:Description",
+    "id" : "BT-761-Lot-List",
+    "parentNodeId" : "ND-TendererLegalForm",
+    "name" : "Tenderer Legal Form Listname",
+    "btId" : "BT-761",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]/cbc:CompanyLegalFormCode/@listName",
+    "xpathRelative" : "cbc:CompanyLegalFormCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-761-Lot",
+    "presetValue" : "required",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-762-notice",
+    "parentNodeId" : "ND-ChangeReason",
+    "name" : "Change Reason Description",
+    "btId" : "BT-762",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:ChangeReason/efbc:ReasonDescription",
+    "xpathRelative" : "efbc:ReasonDescription",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
     "maxLength" : 6000,
@@ -7866,44 +13077,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "condition" : "{ND-ChangeReason} ${BT-140-notice is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-728-Part",
-    "parentNodeId" : "ND-PartPlacePerformance",
-    "name" : "Place Performance Additional Information",
-    "btId" : "BT-728",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:RealizedLocation/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
+    "id" : "BT-762-notice-Language",
+    "parentNodeId" : "ND-ChangeReason",
+    "name" : "Change Reason Description Language",
+    "btId" : "BT-762",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Changes/efac:ChangeReason/efbc:ReasonDescription/@languageID",
+    "xpathRelative" : "efbc:ReasonDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-762-notice",
     "legalType" : "TEXT",
-    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-728-Procedure",
-    "parentNodeId" : "ND-ProcedurePlacePerformanceAdditionalInformation",
-    "name" : "Place Performance Additional Information",
-    "btId" : "BT-728",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-763-Procedure",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "Lots All Required",
+    "btId" : "BT-763",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:PartPresentationCode",
+    "xpathRelative" : "cbc:PartPresentationCode",
+    "type" : "code",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7912,20 +13122,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "tenderlot-presentation",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-729-Lot",
-    "parentNodeId" : "ND-SubcontractTerms",
-    "name" : "Subcontracting Obligation Maximum",
-    "btId" : "BT-729",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms/cbc:MaximumPercent",
-    "xpathRelative" : "cbc:MaximumPercent",
-    "type" : "number",
-    "legalType" : "NUMBER",
+    "id" : "BT-763-Procedure-List",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "Lots All Required Listname",
+    "btId" : "BT-763",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:PartPresentationCode/@listName",
+    "xpathRelative" : "cbc:PartPresentationCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-763-Procedure",
+    "presetValue" : "tenderlot-presentation",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-764-Lot",
+    "parentNodeId" : "ND-LotECatalog",
+    "name" : "Submission Electronic Catalogue",
+    "btId" : "BT-764",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='ecatalog-submission']/cbc:ExecutionRequirementCode",
+    "xpathRelative" : "cbc:ExecutionRequirementCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7934,51 +13167,52 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "10", "11", "12", "13", "14", "15", "16", "17", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-732-Lot",
-    "parentNodeId" : "ND-SecurityClearanceTerms",
-    "name" : "Security Clearance Description",
-    "btId" : "BT-732",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "16", "17" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "ecatalog-submission",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-733-Lot",
-    "parentNodeId" : "ND-LotAwardCriteria",
-    "name" : "Award Criteria Order Justification",
-    "btId" : "BT-733",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "privacy" : {
-      "code" : "awa-cri-ord",
-      "unpublishedFieldId" : "BT-195(BT-733)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-733)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-733)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-733)-Lot"
-    },
+    "id" : "BT-764-Lot-List",
+    "parentNodeId" : "ND-LotECatalog",
+    "name" : "Submission Electronic Catalogue Listname",
+    "btId" : "BT-764",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='ecatalog-submission']/cbc:ExecutionRequirementCode/@listName",
+    "xpathRelative" : "cbc:ExecutionRequirementCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-764-Lot",
+    "presetValue" : "ecatalog-submission",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-765-Lot",
+    "parentNodeId" : "ND-LotFAContractingSystem",
+    "name" : "Framework Agreement",
+    "btId" : "BT-765",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']/cbc:ContractingSystemTypeCode",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -7987,48 +13221,50 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-734-Lot",
-    "parentNodeId" : "ND-LotAwardCriterion",
-    "name" : "Award Criterion Name",
-    "btId" : "BT-734",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/cbc:Name",
-    "xpathRelative" : "cbc:Name",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
-    "privacy" : {
-      "code" : "awa-cri-nam",
-      "unpublishedFieldId" : "BT-195(BT-734)-Lot",
-      "reasonCodeFieldId" : "BT-197(BT-734)-Lot",
-      "reasonDescriptionFieldId" : "BT-196(BT-734)-Lot",
-      "publicationDateFieldId" : "BT-198(BT-734)-Lot"
-    },
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "16", "17", "18", "22", "29", "30", "31" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "framework-agreement",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-765-Lot-List",
+    "parentNodeId" : "ND-LotFAContractingSystem",
+    "name" : "Framework Agreement Listname",
+    "btId" : "BT-765",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']/cbc:ContractingSystemTypeCode/@listName",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-765-Lot",
+    "presetValue" : "framework-agreement",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-735-Lot",
-    "parentNodeId" : "ND-StrategicProcurementInformationLot",
-    "name" : "CVD Contract Type",
-    "btId" : "BT-735",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:StrategicProcurement/efac:StrategicProcurementInformation/efbc:ProcurementCategoryCode",
-    "xpathRelative" : "efbc:ProcurementCategoryCode",
+    "id" : "BT-765-Part",
+    "parentNodeId" : "ND-PartFAContractingSystem",
+    "name" : "Framework Agreement",
+    "btId" : "BT-765",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']/cbc:ContractingSystemTypeCode",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -8039,25 +13275,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "cvd-contract-type",
+        "id" : "framework-agreement",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-736-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Reserved Execution",
-    "btId" : "BT-736",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='reserved-execution']",
-    "xpathRelative" : "cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='reserved-execution']",
+    "id" : "BT-765-Part-List",
+    "parentNodeId" : "ND-PartFAContractingSystem",
+    "name" : "Framework Agreement Listname",
+    "btId" : "BT-765",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='framework-agreement']/cbc:ContractingSystemTypeCode/@listName",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-765-Part",
+    "presetValue" : "framework-agreement",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-766-Lot",
+    "parentNodeId" : "ND-LotDPSContractingSystem",
+    "name" : "Dynamic Purchasing System",
+    "btId" : "BT-766",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']/cbc:ContractingSystemTypeCode",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -8068,7 +13320,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -8077,25 +13329,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "CEI" ],
+        "noticeTypes" : [ "7", "8", "10", "11", "16", "17", "29", "30" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "reserved-execution",
+        "id" : "dps-usage",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-736-Part",
-    "parentNodeId" : "ND-PartTenderingTerms",
-    "name" : "Reserved Execution",
-    "btId" : "BT-736",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='reserved-execution']",
-    "xpathRelative" : "cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='reserved-execution']",
+    "id" : "BT-766-Lot-List",
+    "parentNodeId" : "ND-LotDPSContractingSystem",
+    "name" : "Dynamic Purchasing System Listname",
+    "btId" : "BT-766",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']/cbc:ContractingSystemTypeCode/@listName",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-766-Lot",
+    "presetValue" : "dps-usage",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-766-Part",
+    "parentNodeId" : "ND-PartDPSContractingSystem",
+    "name" : "Dynamic Purchasing System",
+    "btId" : "BT-766",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']/cbc:ContractingSystemTypeCode",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -8113,20 +13381,36 @@
     },
     "codeList" : {
       "value" : {
-        "id" : "reserved-execution",
+        "id" : "dps-usage",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-737-Lot",
-    "parentNodeId" : "ND-LotProcurementDocument",
-    "name" : "Documents Unofficial Language",
-    "btId" : "BT-737",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:LanguageID[../cbc:DocumentStatusCode/text()='non-official']",
-    "xpathRelative" : "cbc:LanguageID[../cbc:DocumentStatusCode/text()='non-official']",
-    "type" : "code",
+    "id" : "BT-766-Part-List",
+    "parentNodeId" : "ND-PartDPSContractingSystem",
+    "name" : "Dynamic Purchasing System Listname",
+    "btId" : "BT-766",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem[cbc:ContractingSystemTypeCode/@listName='dps-usage']/cbc:ContractingSystemTypeCode/@listName",
+    "xpathRelative" : "cbc:ContractingSystemTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-766-Part",
+    "presetValue" : "dps-usage",
     "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-767-Lot",
+    "parentNodeId" : "ND-AuctionTerms",
+    "name" : "Electronic Auction",
+    "btId" : "BT-767",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms/cbc:AuctionConstraintIndicator",
+    "xpathRelative" : "cbc:AuctionConstraintIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8135,27 +13419,36 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "16", "17", "18", "22", "29", "30", "31" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-language",
+        "id" : "indicator",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-737-Part",
-    "parentNodeId" : "ND-PartProcurementDocument",
-    "name" : "Documents Unofficial Language",
-    "btId" : "BT-737",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:LanguageID[../cbc:DocumentStatusCode/text()='non-official']",
-    "xpathRelative" : "cbc:LanguageID[../cbc:DocumentStatusCode/text()='non-official']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-768-Contract",
+    "parentNodeId" : "ND-SettledContract",
+    "name" : "Contract Framework Agreement",
+    "btId" : "BT-768",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efbc:ContractFrameworkIndicator",
+    "xpathRelative" : "efbc:ContractFrameworkIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8164,55 +13457,32 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "29", "30", "31", "32", "33", "34", "35" ],
+        "condition" : "{ND-SettledContract} ${not(BT-142-LotResult == 'selec-w') or BT-765-Lot not in ('fa-mix','fa-w-rc','fa-wo-rc')}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-language",
+        "id" : "indicator",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-738-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Preferred Publication Date",
-    "btId" : "BT-738",
-    "xpathAbsolute" : "/*/cbc:RequestedPublicationDate",
-    "xpathRelative" : "cbc:RequestedPublicationDate",
-    "type" : "date",
-    "legalType" : "DATE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-Root} ${BT-738-notice is present}",
-        "value" : "{ND-Root} ${((BT-738-notice - BT-05(a)-notice) < P60D) and ((BT-738-notice - BT-05(a)-notice) >= P2D)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00738-0053"
-      } ]
-    }
-  }, {
-    "id" : "BT-739-Organization-Company",
-    "parentNodeId" : "ND-CompanyContact",
-    "name" : "Organisation Contact Fax",
-    "btId" : "BT-739",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact/cbc:Telefax",
-    "xpathRelative" : "cbc:Telefax",
-    "type" : "phone",
-    "legalType" : "TEXT",
-    "maxLength" : 30,
+    "id" : "BT-769-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Multiple Tenders",
+    "btId" : "BT-769",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:MultipleTendersCode",
+    "xpathRelative" : "cbc:MultipleTendersCode",
+    "type" : "code",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8221,25 +13491,44 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+    "codeList" : {
+      "value" : {
+        "id" : "permission",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-739-Organization-TouchPoint",
-    "parentNodeId" : "ND-TouchpointContact",
-    "name" : "Contact Fax",
-    "btId" : "BT-739",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact/cbc:Telefax",
-    "xpathRelative" : "cbc:Telefax",
-    "type" : "phone",
+    "id" : "BT-769-Lot-List",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Multiple Tenders Listname",
+    "btId" : "BT-769",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:MultipleTendersCode/@listName",
+    "xpathRelative" : "cbc:MultipleTendersCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-769-Lot",
+    "presetValue" : "permission",
+    "legalType" : "INDICATOR",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-77-Lot",
+    "parentNodeId" : "ND-PaymentTerms",
+    "name" : "Terms Financial",
+    "btId" : "BT-77",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PaymentTerms/cbc:Note",
+    "xpathRelative" : "cbc:Note",
+    "type" : "text-multilingual",
     "legalType" : "TEXT",
-    "maxLength" : 30,
+    "maxLength" : 1000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8248,51 +13537,51 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "BT-739-UBO",
-    "parentNodeId" : "ND-UBOContact",
-    "name" : "UBO Contact Fax",
-    "btId" : "BT-739",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact/cbc:Telefax",
-    "xpathRelative" : "cbc:Telefax",
-    "type" : "phone",
-    "legalType" : "TEXT",
-    "maxLength" : 30,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "17", "18", "22" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-77-Lot-Language",
+    "parentNodeId" : "ND-PaymentTerms",
+    "name" : "Terms Financial Language",
+    "btId" : "BT-77",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PaymentTerms/cbc:Note/@languageID",
+    "xpathRelative" : "cbc:Note/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-77-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^((\\(\\+?[0-9]+\\))|\\+?[0-9]+)( - |-| )?(((\\(\\d+\\))|\\d+)( - |-| )?)*(\\d+)( )?$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-740-Procedure-Buyer",
-    "parentNodeId" : "ND-ContractingParty",
-    "name" : "Buyer Contracting Entity",
-    "btId" : "BT-740",
-    "xpathAbsolute" : "/*/cac:ContractingParty/cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-contracting-type']",
-    "xpathRelative" : "cac:ContractingPartyType/cbc:PartyTypeCode[@listName='buyer-contracting-type']",
+    "id" : "BT-771-Lot",
+    "parentNodeId" : "ND-LateTendererInformation",
+    "name" : "Late Tenderer Information",
+    "btId" : "BT-771",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='missing-info-submission']/cbc:TendererRequirementTypeCode",
+    "xpathRelative" : "cbc:TendererRequirementTypeCode",
     "type" : "code",
-    "legalType" : "INDICATOR",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8301,51 +13590,95 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "4", "5", "7", "8", "10", "11", "12", "13", "15", "16", "17", "20", "21", "22", "23", "24", "25", "26", "29", "30", "33", "34", "36", "37", "38", "39", "40", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "mandatory" : {
+    "codeList" : {
+      "value" : {
+        "id" : "missing-info-submission",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-771-Lot-List",
+    "parentNodeId" : "ND-LateTendererInformation",
+    "name" : "Late Tenderer Information Listname",
+    "btId" : "BT-771",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='missing-info-submission']/cbc:TendererRequirementTypeCode/@listName",
+    "xpathRelative" : "cbc:TendererRequirementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-771-Lot",
+    "presetValue" : "missing-info-submission",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-772-Lot",
+    "parentNodeId" : "ND-LateTendererInformation",
+    "name" : "Late Tenderer Information Description",
+    "btId" : "BT-772",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='missing-info-submission']/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "14", "19", "32", "35", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-772-Lot-Language",
+    "parentNodeId" : "ND-LateTendererInformation",
+    "name" : "Late Tenderer Information Description Language",
+    "btId" : "BT-772",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='missing-info-submission']/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-772-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "buyer-contracting-type",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "condition" : "{ND-ContractingParty} ${(OPP-070-notice in ('3','6','9','CEI','14','18','19','22','27','28','31','32','35','40')) and (BT-11-Procedure-Buyer in ('pub-undert', 'pub-undert-cga', 'pub-undert-ra', 'pub-undert-la', 'spec-rights-entity')) and not(BT-02-notice == 'can-modif') and (BT-740-Procedure-Buyer is present)}",
-        "value" : "{ND-ContractingParty} ${BT-740-Procedure-Buyer == 'cont-ent'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00740-0100"
-      }, {
-        "condition" : "{ND-ContractingParty} ${(OPP-070-notice in ('3','6','9','CEI','14','18','19','22','27','28','31','32','35','40')) and (BT-11-Procedure-Buyer in ('org-sub', 'org-sub-cga', 'org-sub-ra', 'org-sub-la', 'eu-ins-bod-ag', 'def-cont', 'int-org')) and not(BT-02-notice == 'can-modif') and (BT-740-Procedure-Buyer is present)}",
-        "value" : "{ND-ContractingParty} ${BT-740-Procedure-Buyer == 'not-cont-ent'}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00740-0101"
-      } ]
     }
   }, {
-    "id" : "BT-743-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Electronic Invoicing",
-    "btId" : "BT-743",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='einvoicing']",
-    "xpathRelative" : "cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='einvoicing']",
+    "id" : "BT-773-Tender",
+    "parentNodeId" : "ND-SubcontractedContract",
+    "name" : "Subcontracting",
+    "btId" : "BT-773",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efbc:TermCode",
+    "xpathRelative" : "efbc:TermCode",
     "type" : "code",
     "legalType" : "CODE",
+    "privacy" : {
+      "code" : "sub-con",
+      "unpublishedFieldId" : "BT-195(BT-773)-Tender",
+      "reasonCodeFieldId" : "BT-197(BT-773)-Tender",
+      "reasonDescriptionFieldId" : "BT-196(BT-773)-Tender",
+      "publicationDateFieldId" : "BT-198(BT-773)-Tender"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8354,7 +13687,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "38", "39", "40" ],
+        "condition" : "{ND-SubcontractedContract} ${OPT-321-Tender is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -8363,36 +13701,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "16" ],
+        "noticeTypes" : [ "29", "30", "31" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "einvoicing",
+        "id" : "applicability",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-LotTenderingTerms} ${(OPP-070-notice in ('7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','38','39','40') and (BT-743-Lot == 'required')) or not(OPP-070-notice in ('7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','38','39','40')) or not(BT-743-Lot is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00743-0100"
-      } ]
     }
   }, {
-    "id" : "BT-744-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Submission Electronic Signature",
-    "btId" : "BT-744",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='esignature-submission']",
-    "xpathRelative" : "cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='esignature-submission']",
+    "id" : "BT-773-Tender-List",
+    "parentNodeId" : "ND-SubcontractedContract",
+    "name" : "Subcontracting Listname",
+    "btId" : "BT-773",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']/efbc:TermCode/@listName",
+    "xpathRelative" : "efbc:TermCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-773-Tender",
+    "presetValue" : "applicability",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-774-Lot",
+    "parentNodeId" : "ND-LotEnvironmentalImpactType",
+    "name" : "Green Procurement",
+    "btId" : "BT-774",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
     "type" : "code",
-    "legalType" : "INDICATOR",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8401,50 +13746,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "esignature-submission",
+        "id" : "environmental-impact",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-745-Lot",
-    "parentNodeId" : "ND-NoESubmission",
-    "name" : "Submission Nonelectronic Description",
-    "btId" : "BT-745",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-774-Lot-List",
+    "parentNodeId" : "ND-LotEnvironmentalImpactType",
+    "name" : "Green Procurement Listname",
+    "btId" : "BT-774",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-774-Lot",
+    "presetValue" : "environmental-impact",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "BT-746-Organization",
-    "parentNodeId" : "ND-Organization",
-    "name" : "Winner Listed",
-    "btId" : "BT-746",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efbc:ListedOnRegulatedMarketIndicator",
-    "xpathRelative" : "efbc:ListedOnRegulatedMarketIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-775-Lot",
+    "parentNodeId" : "ND-LotSocialObjectiveType",
+    "name" : "Social Procurement",
+    "btId" : "BT-775",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8453,18 +13791,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "social-objective",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-747-Lot",
-    "parentNodeId" : "ND-SelectionCriteria",
-    "name" : "Selection Criteria Type",
-    "btId" : "BT-747",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:CriterionTypeCode[@listName='selection-criterion']",
-    "xpathRelative" : "cbc:CriterionTypeCode[@listName='selection-criterion']",
+    "id" : "BT-775-Lot-List",
+    "parentNodeId" : "ND-LotSocialObjectiveType",
+    "name" : "Social Procurement Listname",
+    "btId" : "BT-775",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-775-Lot",
+    "presetValue" : "social-objective",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-776-Lot",
+    "parentNodeId" : "ND-LotInnovativeAcquisitionType",
+    "name" : "Procurement of Innovation",
+    "btId" : "BT-776",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -8475,49 +13836,44 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "selection-criterion",
+        "id" : "innovative-acquisition",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-NonUBLTenderingTerms} ${sum(number:BT-752-Lot[BT-7531-Lot == 'per-exa']) == 100 or not(BT-752-Lot[BT-7531-Lot == 'per-exa'] is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00747-0100"
-      }, {
-        "value" : "{ND-NonUBLTenderingTerms} ${sum(number:BT-752-Lot[BT-7531-Lot == 'dec-exa']) == 1 or not(BT-752-Lot[BT-7531-Lot == 'dec-exa'] is present)}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00747-0101"
-      } ]
     }
   }, {
-    "id" : "BT-748-Lot",
-    "parentNodeId" : "ND-SelectionCriteria",
-    "name" : "Selection Criteria Used",
-    "btId" : "BT-748",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:CalculationExpressionCode[@listName='usage']",
-    "xpathRelative" : "cbc:CalculationExpressionCode[@listName='usage']",
-    "type" : "code",
+    "id" : "BT-776-Lot-List",
+    "parentNodeId" : "ND-LotInnovativeAcquisitionType",
+    "name" : "Procurement of Innovation Listname",
+    "btId" : "BT-776",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-776-Lot",
+    "presetValue" : "innovative-acquisition",
     "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-777-Lot",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement Description",
+    "btId" : "BT-777",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementType",
+    "xpathRelative" : "cbc:ProcurementType",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8526,37 +13882,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-777-Lot-Language",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement Description Language",
+    "btId" : "BT-777",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementType/@languageID",
+    "xpathRelative" : "cbc:ProcurementType/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-777-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "usage",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
-    },
-    "assert" : {
-      "value" : "{ND-Root} ${TRUE}",
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "value" : "{ND-SelectionCriteria} ${((BT-748-Lot == 'nyk') and (OPP-070-notice in ('7','8','9','10','11','12','13','14'))) or not(BT-748-Lot == 'nyk')}",
-        "severity" : "ERROR",
-        "message" : "rule|text|BR-BT-00748-0100"
-      } ]
     }
   }, {
-    "id" : "BT-749-Lot",
-    "parentNodeId" : "ND-SelectionCriteria",
-    "name" : "Selection Criteria Name",
-    "btId" : "BT-749",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:Name",
-    "xpathRelative" : "cbc:Name",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 400,
+    "id" : "BT-779-Tender",
+    "parentNodeId" : "ND-TenderAggregatedAmounts",
+    "name" : "Tender Payment Value",
+    "btId" : "BT-779",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts/cbc:PaidAmount",
+    "xpathRelative" : "cbc:PaidAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8565,21 +13926,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-75-Lot",
-    "parentNodeId" : "ND-FinancialGuarantee",
-    "name" : "Guarantee Required Description",
-    "btId" : "BT-75",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-779-Tender-Currency",
+    "parentNodeId" : "ND-TenderAggregatedAmounts",
+    "name" : "Tender Payment Value Currency",
+    "btId" : "BT-779",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts/cbc:PaidAmount/@currencyID",
+    "xpathRelative" : "cbc:PaidAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-779-Tender",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eforms-currency",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-78-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Security Clearance Deadline",
+    "btId" : "BT-78",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:LatestSecurityClearanceDate",
+    "xpathRelative" : "cbc:LatestSecurityClearanceDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8592,14 +13974,18 @@
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-750-Lot",
-    "parentNodeId" : "ND-SelectionCriteria",
-    "name" : "Selection Criteria Description",
-    "btId" : "BT-750",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/cbc:Description",
-    "xpathRelative" : "cbc:Description",
+    "id" : "BT-780-Tender",
+    "parentNodeId" : "ND-TenderAggregatedAmounts",
+    "name" : "Tender Payment Value Additional Information",
+    "btId" : "BT-780",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts/efbc:PaidAmountDescription",
+    "xpathRelative" : "efbc:PaidAmountDescription",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
     "maxLength" : 6000,
@@ -8611,58 +13997,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-751-Lot",
-    "parentNodeId" : "ND-FinancialGuarantee",
-    "name" : "Guarantee Required",
-    "btId" : "BT-751",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee/cbc:GuaranteeTypeCode[@listName='tender-guarantee-required']",
-    "xpathRelative" : "cbc:GuaranteeTypeCode[@listName='tender-guarantee-required']",
+    "id" : "BT-780-Tender-Language",
+    "parentNodeId" : "ND-TenderAggregatedAmounts",
+    "name" : "Tender Payment Value Additional Information Language",
+    "btId" : "BT-780",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts/efbc:PaidAmountDescription/@languageID",
+    "xpathRelative" : "efbc:PaidAmountDescription/@languageID",
     "type" : "code",
-    "legalType" : "INDICATOR",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-780-Tender",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "17", "18", "22" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "tender-guarantee-required",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-752-Lot",
-    "parentNodeId" : "ND-SecondStageCriterionParameter",
-    "name" : "Selection Criteria Second Stage Invite Number",
-    "btId" : "BT-752",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter/efbc:ParameterNumeric",
-    "xpathRelative" : "efbc:ParameterNumeric",
-    "type" : "number",
-    "legalType" : "NUMBER",
+    "id" : "BT-781-Lot",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Duration Additional Information",
+    "btId" : "BT-781",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8671,49 +14041,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-7531-Lot",
-    "parentNodeId" : "ND-SecondStageCriterionParameter",
-    "name" : "Selection Criteria Second Stage Invite Number Weight",
-    "btId" : "BT-7531",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter/efbc:ParameterCode[@listName='number-weight']",
-    "xpathRelative" : "efbc:ParameterCode[@listName='number-weight']",
+    "id" : "BT-781-Lot-Language",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Duration Additional Information Language",
+    "btId" : "BT-781",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
     "type" : "code",
-    "legalType" : "CODE",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-781-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "number-weight",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-7532-Lot",
-    "parentNodeId" : "ND-SecondStageCriterionParameter",
-    "name" : "Selection Criteria Second Stage Invite Number Threshold",
-    "btId" : "BT-7532",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:SelectionCriteria/efac:CriterionParameter/efbc:ParameterCode[@listName='number-threshold']",
-    "xpathRelative" : "efbc:ParameterCode[@listName='number-threshold']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-782-Tender",
+    "parentNodeId" : "ND-TenderAggregatedAmounts",
+    "name" : "Tender Penalties",
+    "btId" : "BT-782",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts/efbc:PenaltiesAmount",
+    "xpathRelative" : "efbc:PenaltiesAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8722,25 +14085,40 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "19", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-782-Tender-Currency",
+    "parentNodeId" : "ND-TenderAggregatedAmounts",
+    "name" : "Tender Penalties Currency",
+    "btId" : "BT-782",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts/efbc:PenaltiesAmount/@currencyID",
+    "xpathRelative" : "efbc:PenaltiesAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-782-Tender",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "number-threshold",
+        "id" : "eforms-currency",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-754-Lot",
-    "parentNodeId" : "ND-AccessibilityJustification",
-    "name" : "Accessibility",
-    "btId" : "BT-754",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']/cbc:ProcurementTypeCode[@listName='accessibility']",
-    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='accessibility']",
+    "id" : "BT-783-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request or Decision",
+    "btId" : "BT-783",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:AppealStageCode",
+    "xpathRelative" : "efbc:AppealStageCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -8751,28 +14129,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "accessibility",
+        "id" : "review-status",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-755-Lot",
-    "parentNodeId" : "ND-AccessibilityJustification",
-    "name" : "Accessibility Justification",
-    "btId" : "BT-755",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']/cbc:ProcurementType",
-    "xpathRelative" : "cbc:ProcurementType",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-783-Review-List",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request or Decision Listname",
+    "btId" : "BT-783",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:AppealStageCode/@listName",
+    "xpathRelative" : "efbc:AppealStageCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-783-Review",
+    "presetValue" : "review-status",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-784-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Identifier",
+    "btId" : "BT-784",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:AppealStageID",
+    "xpathRelative" : "efbc:AppealStageID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8781,20 +14174,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-756-Procedure",
-    "parentNodeId" : "ND-ProcedureTenderingProcess",
-    "name" : "PIN Competition Termination",
-    "btId" : "BT-756",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:TerminatedIndicator",
-    "xpathRelative" : "cbc:TerminatedIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-785-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Previous Identifier",
+    "btId" : "BT-785",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:AppealPreviousStageID",
+    "xpathRelative" : "efbc:AppealPreviousStageID",
+    "type" : "id",
+    "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8803,25 +14196,25 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "31", "32", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-757-notice",
-    "parentNodeId" : "ND-Root",
-    "name" : "Notice Version",
-    "btId" : "BT-757",
-    "xpathAbsolute" : "/*/cbc:VersionID",
-    "xpathRelative" : "cbc:VersionID",
+    "id" : "BT-786-Review",
+    "parentNodeId" : "ND-AppealedItemReference",
+    "name" : "Review Notice Section Identifier",
+    "btId" : "BT-786",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealedItem/cbc:ID",
+    "xpathRelative" : "cbc:ID",
     "type" : "id",
     "legalType" : "IDENTIFIER",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
@@ -8831,19 +14224,18 @@
       } ]
     },
     "pattern" : {
-      "value" : "^(0[1-9]|[1-9]\\d)$",
+      "value" : "^(PROCEDURE|BUYER|RESULT|((PAR|LOT|GLO|RES|ORG)-\\d{4}))$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-76-Lot",
-    "parentNodeId" : "ND-TendererLegalForm",
-    "name" : "Tenderer Legal Form Description",
-    "btId" : "BT-76",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]/cbc:CompanyLegalForm",
-    "xpathRelative" : "cbc:CompanyLegalForm",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-787-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Date",
+    "btId" : "BT-787",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Date",
+    "xpathRelative" : "cbc:Date",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8852,20 +14244,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-761-Lot",
-    "parentNodeId" : "ND-TendererLegalForm",
-    "name" : "Tenderer Legal Form",
-    "btId" : "BT-761",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]/cbc:CompanyLegalFormCode",
-    "xpathRelative" : "cbc:CompanyLegalFormCode",
-    "type" : "code",
-    "legalType" : "INDICATOR",
+    "id" : "BT-788-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Title",
+    "btId" : "BT-788",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Title",
+    "xpathRelative" : "cbc:Title",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8874,65 +14270,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "17", "18" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "required",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-763-Procedure",
-    "parentNodeId" : "ND-ProcedureTenderingProcess",
-    "name" : "Lots All Required",
-    "btId" : "BT-763",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:PartPresentationCode",
-    "xpathRelative" : "cbc:PartPresentationCode",
+    "id" : "BT-788-Review-Language",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Title Language",
+    "btId" : "BT-788",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Title/@languageID",
+    "xpathRelative" : "cbc:Title/@languageID",
     "type" : "code",
-    "legalType" : "INDICATOR",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-788-Review",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "tenderlot-presentation",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-764-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Submission Electronic Catalogue",
-    "btId" : "BT-764",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='ecatalog-submission']",
-    "xpathRelative" : "cac:ContractExecutionRequirement/cbc:ExecutionRequirementCode[@listName='ecatalog-submission']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-789-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Description",
+    "btId" : "BT-789",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -8941,34 +14314,40 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "16", "17" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-789-Review-Language",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Description Language",
+    "btId" : "BT-789",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-789-Review",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "ecatalog-submission",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-765-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "Framework Agreement",
-    "btId" : "BT-765",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='framework-agreement']",
-    "xpathRelative" : "cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='framework-agreement']",
+    "id" : "BT-79-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Performing Staff Qualification",
+    "btId" : "BT-79",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RequiredCurriculaCode",
+    "xpathRelative" : "cbc:RequiredCurriculaCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -8979,34 +14358,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "16", "17", "18", "22", "29", "30", "31" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "framework-agreement",
+        "id" : "requirement-stage",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-765-Part",
-    "parentNodeId" : "ND-PartTenderingProcess",
-    "name" : "Framework Agreement",
-    "btId" : "BT-765",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='framework-agreement']",
-    "xpathRelative" : "cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='framework-agreement']",
+    "id" : "BT-79-Lot-List",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Performing Staff Qualification Listname",
+    "btId" : "BT-79",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RequiredCurriculaCode/@listName",
+    "xpathRelative" : "cbc:RequiredCurriculaCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-79-Lot",
+    "presetValue" : "requirement-stage",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-790-Review",
+    "parentNodeId" : "ND-AppealDecision",
+    "name" : "Review Decision Type",
+    "btId" : "BT-790",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealDecision/efbc:DecisionTypeCode",
+    "xpathRelative" : "efbc:DecisionTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -9017,25 +14403,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "framework-agreement",
+        "id" : "review-decision-type",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-766-Lot",
-    "parentNodeId" : "ND-LotTenderingProcess",
-    "name" : "Dynamic Purchasing System",
-    "btId" : "BT-766",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='dps-usage']",
-    "xpathRelative" : "cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='dps-usage']",
+    "id" : "BT-790-Review-List",
+    "parentNodeId" : "ND-AppealDecision",
+    "name" : "Review Decision Type Listname",
+    "btId" : "BT-790",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealDecision/efbc:DecisionTypeCode/@listName",
+    "xpathRelative" : "efbc:DecisionTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-790-Review",
+    "presetValue" : "review-decision-type",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-791-Review",
+    "parentNodeId" : "ND-AppealIrregularity",
+    "name" : "Review Irregularity Type",
+    "btId" : "BT-791",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealIrregularity/efbc:IrregularityTypeCode",
+    "xpathRelative" : "efbc:IrregularityTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -9046,34 +14448,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "28", "32", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "10", "11", "16", "17", "29", "30" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "dps-usage",
+        "id" : "irregularity-type",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-766-Part",
-    "parentNodeId" : "ND-PartTenderingProcess",
-    "name" : "Dynamic Purchasing System",
-    "btId" : "BT-766",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingProcess/cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='dps-usage']",
-    "xpathRelative" : "cac:ContractingSystem/cbc:ContractingSystemTypeCode[@listName='dps-usage']",
+    "id" : "BT-791-Review-List",
+    "parentNodeId" : "ND-AppealIrregularity",
+    "name" : "Review Irregularity Type Listname",
+    "btId" : "BT-791",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealIrregularity/efbc:IrregularityTypeCode/@listName",
+    "xpathRelative" : "efbc:IrregularityTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-791-Review",
+    "presetValue" : "irregularity-type",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-792-Review",
+    "parentNodeId" : "ND-AppealRemedy",
+    "name" : "Review Remedy Type",
+    "btId" : "BT-792",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealRemedy/efbc:RemedyTypeCode",
+    "xpathRelative" : "efbc:RemedyTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
@@ -9084,88 +14493,87 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "dps-usage",
+        "id" : "remedy-type",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-767-Lot",
-    "parentNodeId" : "ND-AuctionTerms",
-    "name" : "Electronic Auction",
-    "btId" : "BT-767",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms/cbc:AuctionConstraintIndicator",
-    "xpathRelative" : "cbc:AuctionConstraintIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "BT-792-Review-List",
+    "parentNodeId" : "ND-AppealRemedy",
+    "name" : "Review Remedy Type Listname",
+    "btId" : "BT-792",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealRemedy/efbc:RemedyTypeCode/@listName",
+    "xpathRelative" : "efbc:RemedyTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-792-Review",
+    "presetValue" : "remedy-type",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
+    }
+  }, {
+    "id" : "BT-793-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Remedy Value",
+    "btId" : "BT-793",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:RemedyAmount",
+    "xpathRelative" : "efbc:RemedyAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
+    "repeatable" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+      "severity" : "ERROR"
     },
-    "mandatory" : {
+    "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "16", "17", "18", "22", "29", "30", "31" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-769-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Multiple Tenders",
-    "btId" : "BT-769",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:MultipleTendersCode",
-    "xpathRelative" : "cbc:MultipleTendersCode",
+    "id" : "BT-793-Review-Currency",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Remedy Value Currency",
+    "btId" : "BT-793",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:RemedyAmount/@currencyID",
+    "xpathRelative" : "efbc:RemedyAmount/@currencyID",
     "type" : "code",
-    "legalType" : "INDICATOR",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-793-Review",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "15", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "permission",
+        "id" : "eforms-currency",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-77-Lot",
-    "parentNodeId" : "ND-PaymentTerms",
-    "name" : "Terms Financial",
-    "btId" : "BT-77",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PaymentTerms/cbc:Note",
-    "xpathRelative" : "cbc:Note",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 1000,
+    "id" : "BT-794-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review URL",
+    "btId" : "BT-794",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:URI",
+    "xpathRelative" : "cbc:URI",
+    "type" : "url",
+    "legalType" : "URL",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9174,29 +14582,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "17", "18", "22" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+    "pattern" : {
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-771-Lot",
-    "parentNodeId" : "ND-LateTendererInformation",
-    "name" : "Late Tenderer Information",
-    "btId" : "BT-771",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]/cbc:TendererRequirementTypeCode[@listName='missing-info-submission']",
-    "xpathRelative" : "cbc:TendererRequirementTypeCode[@listName='missing-info-submission']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-795-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request Fee",
+    "btId" : "BT-795",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:FeeAmount",
+    "xpathRelative" : "cbc:FeeAmount",
+    "type" : "amount",
+    "legalType" : "VALUE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9205,28 +14608,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-795-Review-Currency",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request Fee Currency",
+    "btId" : "BT-795",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:FeeAmount/@currencyID",
+    "xpathRelative" : "cbc:FeeAmount/@currencyID",
+    "type" : "code",
+    "attributeName" : "currencyID",
+    "attributeOf" : "BT-795-Review",
+    "legalType" : "VALUE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "missing-info-submission",
+        "id" : "eforms-currency",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-772-Lot",
-    "parentNodeId" : "ND-LateTendererInformation",
-    "name" : "Late Tenderer Information Description",
-    "btId" : "BT-772",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-796-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request Withdrawn",
+    "btId" : "BT-796",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:WithdrawnAppealIndicator",
+    "xpathRelative" : "efbc:WithdrawnAppealIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9235,128 +14652,140 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "22", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-774-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Green Procurement",
-    "btId" : "BT-774",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='environmental-impact']",
-    "xpathRelative" : "cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='environmental-impact']",
-    "type" : "code",
-    "legalType" : "CODE",
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-797-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request Withdrawn Date",
+    "btId" : "BT-797",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:WithdrawnAppealDate",
+    "xpathRelative" : "efbc:WithdrawnAppealDate",
+    "type" : "date",
+    "legalType" : "DATE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "environmental-impact",
-        "type" : "flat"
-      },
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-775-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Social Procurement",
-    "btId" : "BT-775",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='social-objective']",
-    "xpathRelative" : "cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='social-objective']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-798-Review",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request Withdrawn Reasons",
+    "btId" : "BT-798",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:WithdrawnAppealReasons",
+    "xpathRelative" : "efbc:WithdrawnAppealReasons",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-798-Review-Language",
+    "parentNodeId" : "ND-ReviewStatus",
+    "name" : "Review Request Withdrawn Reasons Language",
+    "btId" : "BT-798",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:WithdrawnAppealReasons/@languageID",
+    "xpathRelative" : "efbc:WithdrawnAppealReasons/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-798-Review",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "social-objective",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-776-Lot",
-    "parentNodeId" : "ND-LotProcurementScope",
-    "name" : "Procurement of Innovation",
-    "btId" : "BT-776",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='innovative-acquisition']",
-    "xpathRelative" : "cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='innovative-acquisition']",
+    "id" : "BT-799-ReviewBody",
+    "parentNodeId" : "ND-AppealProcessingParty",
+    "name" : "Review Body Type",
+    "btId" : "BT-799",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealProcessingParty/efbc:AppealProcessingPartyTypeCode",
+    "xpathRelative" : "efbc:AppealProcessingPartyTypeCode",
     "type" : "code",
     "legalType" : "CODE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "innovative-acquisition",
+        "id" : "review-body-type",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-777-Lot",
-    "parentNodeId" : "ND-StrategicProcurementType",
-    "name" : "Strategic Procurement Description",
-    "btId" : "BT-777",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementType",
-    "xpathRelative" : "cbc:ProcurementType",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "BT-799-ReviewBody-List",
+    "parentNodeId" : "ND-AppealProcessingParty",
+    "name" : "Review Body Type Listname",
+    "btId" : "BT-799",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealProcessingParty/efbc:AppealProcessingPartyTypeCode/@listName",
+    "xpathRelative" : "efbc:AppealProcessingPartyTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-799-ReviewBody",
+    "presetValue" : "review-body-type",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "BT-78-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Security Clearance Deadline",
-    "btId" : "BT-78",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:LatestSecurityClearanceDate",
-    "xpathRelative" : "cbc:LatestSecurityClearanceDate",
+    "id" : "BT-800(d)-Lot",
+    "parentNodeId" : "ND-PMCAnswersDeadline",
+    "name" : "Deadline Receipt Answers (Date)",
+    "btId" : "BT-800",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod/cbc:EndDate",
+    "xpathRelative" : "cbc:EndDate",
     "type" : "date",
     "legalType" : "DATE",
     "repeatable" : {
@@ -9367,24 +14796,24 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-781-Lot",
-    "parentNodeId" : "ND-LotDuration",
-    "name" : "Duration Additional Information",
-    "btId" : "BT-781",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
+    "id" : "BT-800(t)-Lot",
+    "parentNodeId" : "ND-PMCAnswersDeadline",
+    "name" : "Deadline Receipt Answers (Time)",
+    "btId" : "BT-800",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod/cbc:EndTime",
+    "xpathRelative" : "cbc:EndTime",
+    "type" : "time",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9397,16 +14826,20 @@
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "pattern" : {
+      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-783-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Request or Decision",
-    "btId" : "BT-783",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:AppealStageCode",
-    "xpathRelative" : "efbc:AppealStageCode",
+    "id" : "BT-801-Lot",
+    "parentNodeId" : "ND-NDA",
+    "name" : "Non Disclosure Agreement",
+    "btId" : "BT-801",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']/cbc:ExecutionRequirementCode",
+    "xpathRelative" : "cbc:ExecutionRequirementCode",
     "type" : "code",
-    "legalType" : "CODE",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9415,49 +14848,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "review-status",
+        "id" : "nda",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-784-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Identifier",
-    "btId" : "BT-784",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:AppealStageID",
-    "xpathRelative" : "efbc:AppealStageID",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-801-Lot-List",
+    "parentNodeId" : "ND-NDA",
+    "name" : "Non Disclosure Agreement Listname",
+    "btId" : "BT-801",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']/cbc:ExecutionRequirementCode/@listName",
+    "xpathRelative" : "cbc:ExecutionRequirementCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-801-Lot",
+    "presetValue" : "nda",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "BT-785-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Previous Identifier",
-    "btId" : "BT-785",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:AppealPreviousStageID",
-    "xpathRelative" : "efbc:AppealPreviousStageID",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-802-Lot",
+    "parentNodeId" : "ND-NDA",
+    "name" : "Non Disclosure Agreement Description",
+    "btId" : "BT-802",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']/cbc:Description",
+    "xpathRelative" : "cbc:Description",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9466,46 +14893,55 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-786-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Notice Section Identifier",
-    "btId" : "BT-786",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealedItem/cbc:ID",
-    "xpathRelative" : "efac:AppealedItem/cbc:ID",
-    "type" : "id",
-    "legalType" : "IDENTIFIER",
+    "id" : "BT-802-Lot-Language",
+    "parentNodeId" : "ND-NDA",
+    "name" : "Non Disclosure Agreement Description Language",
+    "btId" : "BT-802",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-802-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
-      "value" : true,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^(PROCEDURE|BUYER|RESULT|((PAR|LOT|GLO|RES|ORG)-\\d{4}))$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-787-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Date",
-    "btId" : "BT-787",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Date",
-    "xpathRelative" : "cbc:Date",
+    "id" : "BT-803(d)-notice",
+    "parentNodeId" : "ND-RootExtension",
+    "name" : "Notice Dispatch Date eSender (date)",
+    "btId" : "BT-803",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate",
+    "xpathRelative" : "efbc:TransmissionDate",
     "type" : "date",
     "legalType" : "DATE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-803(t)-notice",
+    "parentNodeId" : "ND-RootExtension",
+    "name" : "Notice Dispatch Date eSender (time)",
+    "btId" : "BT-803",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionTime",
+    "xpathRelative" : "efbc:TransmissionTime",
+    "type" : "time",
+    "legalType" : "DATE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9515,23 +14951,29 @@
       "severity" : "ERROR",
       "constraints" : [ {
         "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "condition" : "{ND-RootExtension} ${BT-803(d)-notice is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
     }
   }, {
-    "id" : "BT-788-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Title",
-    "btId" : "BT-788",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Title",
-    "xpathRelative" : "cbc:Title",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
+    "id" : "BT-805-Lot",
+    "parentNodeId" : "ND-LotGreenCriteria",
+    "name" : "Green Procurement Criteria",
+    "btId" : "BT-805",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9540,20 +14982,51 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "gpp-criteria",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-789-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Description",
-    "btId" : "BT-789",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:Description",
+    "id" : "BT-805-Lot-List",
+    "parentNodeId" : "ND-LotGreenCriteria",
+    "name" : "Green Procurement Criteria Listname",
+    "btId" : "BT-805",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-805-Lot",
+    "presetValue" : "gpp-criteria",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-88-Procedure",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "Procedure Features",
+    "btId" : "BT-88",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:Description",
     "xpathRelative" : "cbc:Description",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "privacy" : {
+      "code" : "pro-fea",
+      "unpublishedFieldId" : "BT-195(BT-88)-Procedure",
+      "reasonCodeFieldId" : "BT-197(BT-88)-Procedure",
+      "reasonDescriptionFieldId" : "BT-196(BT-88)-Procedure",
+      "publicationDateFieldId" : "BT-198(BT-88)-Procedure"
+    },
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9562,49 +15035,51 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-79-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Performing Staff Qualification",
-    "btId" : "BT-79",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RequiredCurriculaCode",
-    "xpathRelative" : "cbc:RequiredCurriculaCode",
-    "type" : "code",
-    "legalType" : "CODE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "12", "13", "20", "21" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-88-Procedure-Language",
+    "parentNodeId" : "ND-ProcedureTenderingProcess",
+    "name" : "Procedure Features Language",
+    "btId" : "BT-88",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-88-Procedure",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
     "codeList" : {
       "value" : {
-        "id" : "requirement-stage",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-790-Review",
-    "parentNodeId" : "ND-AppealDecision",
-    "name" : "Review Decision Type",
-    "btId" : "BT-790",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealDecision/efbc:DecisionTypeCode",
-    "xpathRelative" : "efbc:DecisionTypeCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-92-Lot",
+    "parentNodeId" : "ND-PostAwardProcess",
+    "name" : "Electronic Ordering",
+    "btId" : "BT-92",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess/cbc:ElectronicOrderUsageIndicator",
+    "xpathRelative" : "cbc:ElectronicOrderUsageIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9613,27 +15088,36 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "16" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "review-decision-type",
+        "id" : "indicator",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-791-Review",
-    "parentNodeId" : "ND-AppealIrregularity",
-    "name" : "Review Irregularity Type",
-    "btId" : "BT-791",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealIrregularity/efbc:IrregularityTypeCode",
-    "xpathRelative" : "efbc:IrregularityTypeCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-93-Lot",
+    "parentNodeId" : "ND-PostAwardProcess",
+    "name" : "Electronic Payment",
+    "btId" : "BT-93",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess/cbc:ElectronicPaymentUsageIndicator",
+    "xpathRelative" : "cbc:ElectronicPaymentUsageIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9642,27 +15126,36 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "16" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "irregularity-type",
+        "id" : "indicator",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-792-Review",
-    "parentNodeId" : "ND-AppealRemedy",
-    "name" : "Review Remedy Type",
-    "btId" : "BT-792",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealRemedy/efbc:RemedyTypeCode",
-    "xpathRelative" : "efbc:RemedyTypeCode",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "BT-94-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Recurrence",
+    "btId" : "BT-94",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RecurringProcurementIndicator",
+    "xpathRelative" : "cbc:RecurringProcurementIndicator",
+    "type" : "indicator",
+    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9671,27 +15164,28 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "remedy-type",
+        "id" : "indicator",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-793-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Remedy Value",
-    "btId" : "BT-793",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:RemedyAmount",
-    "xpathRelative" : "efbc:RemedyAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
+    "id" : "BT-95-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Recurrence Description",
+    "btId" : "BT-95",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RecurringProcurementDescription",
+    "xpathRelative" : "cbc:RecurringProcurementDescription",
+    "type" : "text-multilingual",
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9700,46 +15194,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-794-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review URL",
-    "btId" : "BT-794",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:URI",
-    "xpathRelative" : "cbc:URI",
-    "type" : "url",
-    "legalType" : "URL",
+    "id" : "BT-95-Lot-Language",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Recurrence Description Language",
+    "btId" : "BT-95",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RecurringProcurementDescription/@languageID",
+    "xpathRelative" : "cbc:RecurringProcurementDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-95-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-795-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Request Fee",
-    "btId" : "BT-795",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/cbc:FeeAmount",
-    "xpathRelative" : "cbc:FeeAmount",
-    "type" : "amount",
-    "legalType" : "VALUE",
+    "id" : "BT-97-Lot",
+    "parentNodeId" : "ND-LotSubmissionLanguage",
+    "name" : "Submission Language",
+    "btId" : "BT-97",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:Language/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "code",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9748,49 +15238,37 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-796-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Request Withdrawn",
-    "btId" : "BT-796",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:WithdrawnAppealIndicator",
-    "xpathRelative" : "efbc:WithdrawnAppealIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "16", "17", "18", "19", "20", "21", "22" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "indicator",
-        "type" : "flat"
+        "id" : "eforms-language",
+        "type" : "flat",
+        "parentId" : "language"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-797-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Request Withdrawn Date",
-    "btId" : "BT-797",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:WithdrawnAppealDate",
-    "xpathRelative" : "efbc:WithdrawnAppealDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "BT-98-Lot",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Tender Validity Deadline",
+    "btId" : "BT-98",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderValidityPeriod/cbc:DurationMeasure",
+    "xpathRelative" : "cac:TenderValidityPeriod/cbc:DurationMeasure",
+    "type" : "measure",
+    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9799,24 +15277,43 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "BT-98-Lot-Unit",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Tender Validity Deadline Unit",
+    "btId" : "BT-98",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderValidityPeriod/cbc:DurationMeasure/@unitCode",
+    "xpathRelative" : "cac:TenderValidityPeriod/cbc:DurationMeasure/@unitCode",
+    "type" : "code",
+    "attributeName" : "unitCode",
+    "attributeOf" : "BT-98-Lot",
+    "legalType" : "DURATION",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "codeList" : {
+      "value" : {
+        "id" : "duration-unit",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-798-Review",
-    "parentNodeId" : "ND-ReviewStatus",
-    "name" : "Review Request Withdrawn Reasons",
-    "btId" : "BT-798",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efbc:WithdrawnAppealReasons",
-    "xpathRelative" : "efbc:WithdrawnAppealReasons",
+    "id" : "BT-99-Lot",
+    "parentNodeId" : "ND-ReviewPresentationPeriod",
+    "name" : "Review Deadline Description",
+    "btId" : "BT-99",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod/cbc:Description",
+    "xpathRelative" : "cbc:Description",
     "type" : "text-multilingual",
     "legalType" : "TEXT",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9825,49 +15322,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "22", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-799-ReviewBody",
-    "parentNodeId" : "ND-AppealProcessingParty",
-    "name" : "Review Body Type",
-    "btId" : "BT-799",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealProcessingParty/efbc:AppealProcessingPartyTypeCode",
-    "xpathRelative" : "efbc:AppealProcessingPartyTypeCode",
+    "id" : "BT-99-Lot-Language",
+    "parentNodeId" : "ND-ReviewPresentationPeriod",
+    "name" : "Review Deadline Description Language",
+    "btId" : "BT-99",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
     "type" : "code",
-    "legalType" : "CODE",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-99-Lot",
+    "legalType" : "TEXT",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
     "codeList" : {
       "value" : {
-        "id" : "review-body-type",
+        "id" : "eu-official-language",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-800(d)-Lot",
-    "parentNodeId" : "ND-PMCAnswersDeadline",
-    "name" : "Deadline Receipt Answers (Date)",
-    "btId" : "BT-800",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod/cbc:EndDate",
-    "xpathRelative" : "cbc:EndDate",
-    "type" : "date",
-    "legalType" : "DATE",
+    "id" : "OPA-36-Lot-Number",
+    "parentNodeId" : "ND-LotDuration",
+    "name" : "Numeric value of the duration period",
+    "btId" : "BT-36",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
+    "xpathRelative" : "cbc:DurationMeasure",
+    "type" : "number",
+    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9876,24 +15366,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-800(t)-Lot",
-    "parentNodeId" : "ND-PMCAnswersDeadline",
-    "name" : "Deadline Receipt Answers (Time)",
-    "btId" : "BT-800",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod/cbc:EndTime",
-    "xpathRelative" : "cbc:EndTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "OPA-36-Part-Number",
+    "parentNodeId" : "ND-PartDuration",
+    "name" : "Numeric value of the duration period",
+    "btId" : "BT-36",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
+    "xpathRelative" : "cbc:DurationMeasure",
+    "type" : "number",
+    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9902,24 +15388,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "pattern" : {
-      "value" : "^(([01]\\d|2[0-3])((:[0-5]\\d){1,2}(\\.\\d+)?)?)(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-801-Lot",
-    "parentNodeId" : "ND-NDA",
-    "name" : "Non Disclosure Agreement",
-    "btId" : "BT-801",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']/cbc:ExecutionRequirementCode[@listName='nda']",
-    "xpathRelative" : "cbc:ExecutionRequirementCode[@listName='nda']",
-    "type" : "code",
-    "legalType" : "INDICATOR",
+    "id" : "OPA-98-Lot-Number",
+    "parentNodeId" : "ND-LotTenderingTerms",
+    "name" : "Numeric value of the tender validity deadline",
+    "btId" : "BT-98",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderValidityPeriod/cbc:DurationMeasure",
+    "xpathRelative" : "cac:TenderValidityPeriod/cbc:DurationMeasure",
+    "type" : "number",
+    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9928,27 +15410,19 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "nda",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-802-Lot",
-    "parentNodeId" : "ND-NDA",
-    "name" : "Non Disclosure Agreement Description",
-    "btId" : "BT-802",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
+    "id" : "OPP-010-notice",
+    "parentNodeId" : "ND-Publication",
+    "name" : "Notice Publication Number",
+    "btId" : "OPP-010",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:NoticePublicationID[@schemeName='ojs-notice-id']",
+    "xpathRelative" : "efbc:NoticePublicationID[@schemeName='ojs-notice-id']",
+    "type" : "id",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -9957,46 +15431,38 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "BT-803(d)-notice",
-    "parentNodeId" : "ND-RootExtension",
-    "name" : "Notice Dispatch Date eSender (date)",
-    "btId" : "BT-803",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionDate",
-    "xpathRelative" : "efbc:TransmissionDate",
-    "type" : "date",
-    "legalType" : "DATE",
-    "repeatable" : {
-      "value" : false,
+    },
+    "pattern" : {
+      "value" : "^(\\d{1,8})-(19|20)\\d\\d$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-803(t)-notice",
-    "parentNodeId" : "ND-RootExtension",
-    "name" : "Notice Dispatch Date eSender (time)",
-    "btId" : "BT-803",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efbc:TransmissionTime",
-    "xpathRelative" : "efbc:TransmissionTime",
-    "type" : "time",
-    "legalType" : "DATE",
+    "id" : "OPP-010-notice-Scheme",
+    "parentNodeId" : "ND-Publication",
+    "name" : "Notice Publication Number Schemename",
+    "btId" : "OPP-010",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:NoticePublicationID[@schemeName='ojs-notice-id']/@schemeName",
+    "xpathRelative" : "efbc:NoticePublicationID[@schemeName='ojs-notice-id']/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPP-010-notice",
+    "presetValue" : "ojs-notice-id",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-805-Lot",
-    "parentNodeId" : "ND-LotGreenCriteria",
-    "name" : "Green Procurement Criteria",
-    "btId" : "BT-805",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']/cbc:ProcurementTypeCode[@listName='gpp-criteria']",
-    "xpathRelative" : "cbc:ProcurementTypeCode[@listName='gpp-criteria']",
-    "type" : "code",
-    "legalType" : "CODE",
+    "id" : "OPP-011-notice",
+    "parentNodeId" : "ND-Publication",
+    "name" : "OJEU Identifier",
+    "btId" : "OPP-011",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:GazetteID[@schemeName='ojs-id']",
+    "xpathRelative" : "efbc:GazetteID[@schemeName='ojs-id']",
+    "type" : "id",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10005,35 +15471,38 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "gpp-criteria",
-        "type" : "flat"
-      },
+    "pattern" : {
+      "value" : "^[1-9]\\d{0,2}/(19|20)\\d\\d$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-88-Procedure",
-    "parentNodeId" : "ND-ProcedureTenderingProcess",
-    "name" : "Procedure Features",
-    "btId" : "BT-88",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cbc:Description",
-    "xpathRelative" : "cbc:Description",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
-    "privacy" : {
-      "code" : "pro-fea",
-      "unpublishedFieldId" : "BT-195(BT-88)-Procedure",
-      "reasonCodeFieldId" : "BT-197(BT-88)-Procedure",
-      "reasonDescriptionFieldId" : "BT-196(BT-88)-Procedure",
-      "publicationDateFieldId" : "BT-198(BT-88)-Procedure"
-    },
+    "id" : "OPP-011-notice-Scheme",
+    "parentNodeId" : "ND-Publication",
+    "name" : "OJEU Identifier Schemename",
+    "btId" : "OPP-011",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:GazetteID[@schemeName='ojs-id']/@schemeName",
+    "xpathRelative" : "efbc:GazetteID[@schemeName='ojs-id']/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPP-011-notice",
+    "presetValue" : "ojs-id",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPP-012-notice",
+    "parentNodeId" : "ND-Publication",
+    "name" : "OJEU Publication Date",
+    "btId" : "OPP-012",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:PublicationDate",
+    "xpathRelative" : "efbc:PublicationDate",
+    "type" : "date",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10042,29 +15511,23 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "25", "26", "27", "28", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "12", "13", "20", "21" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+    "pattern" : {
+      "value" : "^((((1[6-9]|[2-9]\\d)\\d{2})-(((0[13578]|1[02]))-31|((0[13-9]|1[0-2])-(29|30))))|(((((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))-02-29))|(((1[6-9]|[2-9]\\d)\\d{2})-((0[1-9])|(1[0-2]))-(0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-92-Lot",
-    "parentNodeId" : "ND-PostAwarProcess",
-    "name" : "Electronic Ordering",
-    "btId" : "BT-92",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess/cbc:ElectronicOrderUsageIndicator",
-    "xpathRelative" : "cbc:ElectronicOrderUsageIndicator",
+    "id" : "OPP-020-Contract",
+    "parentNodeId" : "ND-ExtendedDurationJustification",
+    "name" : "Assets related contract extension indicator",
+    "btId" : "OPP-020",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efbc:ExtendedDurationIndicator",
+    "xpathRelative" : "efbc:ExtendedDurationIndicator",
     "type" : "indicator",
-    "legalType" : "INDICATOR",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10073,7 +15536,12 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "T02" ],
+        "condition" : "{ND-ExtendedDurationJustification} ${(OPT-316-Contract is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -10082,20 +15550,27 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "16" ],
+        "noticeTypes" : [ "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-93-Lot",
-    "parentNodeId" : "ND-PostAwarProcess",
-    "name" : "Electronic Payment",
-    "btId" : "BT-93",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess/cbc:ElectronicPaymentUsageIndicator",
-    "xpathRelative" : "cbc:ElectronicPaymentUsageIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "OPP-021-Contract",
+    "parentNodeId" : "ND-Asset",
+    "name" : "Used asset",
+    "btId" : "OPP-021",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset/efbc:AssetDescription",
+    "xpathRelative" : "efbc:AssetDescription",
+    "type" : "text-multilingual",
+    "maxLength" : 4000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10104,29 +15579,41 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "mandatory" : {
+    }
+  }, {
+    "id" : "OPP-021-Contract-Language",
+    "parentNodeId" : "ND-Asset",
+    "name" : "Used asset Language",
+    "btId" : "OPP-021",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset/efbc:AssetDescription/@languageID",
+    "xpathRelative" : "efbc:AssetDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPP-021-Contract",
+    "repeatable" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "16" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-94-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Recurrence",
-    "btId" : "BT-94",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RecurringProcurementIndicator",
-    "xpathRelative" : "cbc:RecurringProcurementIndicator",
-    "type" : "indicator",
-    "legalType" : "INDICATOR",
+    "id" : "OPP-022-Contract",
+    "parentNodeId" : "ND-Asset",
+    "name" : "Significance (%)",
+    "btId" : "OPP-022",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset/efbc:AssetSignificance",
+    "xpathRelative" : "efbc:AssetSignificance",
+    "type" : "text",
+    "maxLength" : 30,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10135,21 +15622,20 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-95-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Recurrence Description",
-    "btId" : "BT-95",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cbc:RecurringProcurementDescription",
-    "xpathRelative" : "cbc:RecurringProcurementDescription",
-    "type" : "text-multilingual",
-    "legalType" : "TEXT",
-    "maxLength" : 6000,
+    "id" : "OPP-023-Contract",
+    "parentNodeId" : "ND-Asset",
+    "name" : "Predominance (%)",
+    "btId" : "OPP-023",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset/efbc:AssetPredominance",
+    "xpathRelative" : "efbc:AssetPredominance",
+    "type" : "text",
+    "maxLength" : 30,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10158,29 +15644,28 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "BT-97-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Submission Language",
-    "btId" : "BT-97",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:Language/cbc:ID",
-    "xpathRelative" : "cac:Language/cbc:ID",
+    "id" : "OPP-030-Tender",
+    "parentNodeId" : "ND-OtherContractExecutionConditions",
+    "name" : "Contract conditions Code",
+    "btId" : "OPP-030",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']/efbc:TermCode",
+    "xpathRelative" : "efbc:TermCode",
     "type" : "code",
-    "legalType" : "CODE",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -10189,50 +15674,42 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "16", "17", "18", "19", "20", "21", "22" ],
+        "noticeTypes" : [ "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "eforms-language",
+        "id" : "contract-term",
         "type" : "flat",
-        "parentId" : "language"
+        "parentId" : "contract-detail"
       },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "BT-98-Lot",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Tender Validity Deadline",
-    "btId" : "BT-98",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderValidityPeriod/cbc:DurationMeasure",
-    "xpathRelative" : "cac:TenderValidityPeriod/cbc:DurationMeasure",
-    "type" : "measure",
-    "legalType" : "DURATION",
+    "id" : "OPP-030-Tender-List",
+    "parentNodeId" : "ND-OtherContractExecutionConditions",
+    "name" : "Contract conditions Code Listname",
+    "btId" : "OPP-030",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']/efbc:TermCode/@listName",
+    "xpathRelative" : "efbc:TermCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPP-030-Tender",
+    "presetValue" : "contract-detail",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "BT-99-Lot",
-    "parentNodeId" : "ND-ReviewPresentationPeriod",
-    "name" : "Review Deadline Description",
-    "btId" : "BT-99",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod/cbc:Description",
-    "xpathRelative" : "cbc:Description",
+    "id" : "OPP-031-Tender",
+    "parentNodeId" : "ND-OtherContractExecutionConditions",
+    "name" : "Contract Conditions Description (other than revenue allocation)",
+    "btId" : "OPP-031",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']/efbc:TermDescription",
+    "xpathRelative" : "efbc:TermDescription",
     "type" : "text-multilingual",
-    "legalType" : "TEXT",
     "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
@@ -10242,42 +15719,49 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "22", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "OPA-27-Procedure-Currency",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
-    "name" : "Currency of the estimated value of the procedure",
-    "btId" : "BT-27",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount/@currencyID",
-    "xpathRelative" : "cac:RequestedTenderTotal/cbc:EstimatedOverallContractAmount/@currencyID",
-    "type" : "code",
-    "legalType" : "VALUE",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "15", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "OPA-36-Lot-Number",
-    "parentNodeId" : "ND-LotDuration",
-    "name" : "Numeric value of the duration period",
-    "btId" : "BT-36",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
-    "xpathRelative" : "cbc:DurationMeasure",
+    "id" : "OPP-031-Tender-Language",
+    "parentNodeId" : "ND-OtherContractExecutionConditions",
+    "name" : "Contract Conditions Description (other than revenue allocation) Language",
+    "btId" : "OPP-031",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']/efbc:TermDescription/@languageID",
+    "xpathRelative" : "efbc:TermDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPP-031-Tender",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPP-032-Tender",
+    "parentNodeId" : "ND-RevenueAllocation",
+    "name" : "Revenues Allocation",
+    "btId" : "OPP-032",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']/efbc:TermPercent",
+    "xpathRelative" : "efbc:TermPercent",
     "type" : "number",
-    "legalType" : "DURATION",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10286,7 +15770,7 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "36", "37", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
@@ -10295,20 +15779,19 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "CEI" ],
+        "noticeTypes" : [ "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "OPA-36-Part-Number",
-    "parentNodeId" : "ND-PartDuration",
-    "name" : "Numeric value of the duration period",
-    "btId" : "BT-36",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:ProcurementProject/cac:PlannedPeriod/cbc:DurationMeasure",
-    "xpathRelative" : "cbc:DurationMeasure",
-    "type" : "number",
-    "legalType" : "DURATION",
+    "id" : "OPP-033-Tender",
+    "parentNodeId" : "ND-RewardsPenalties",
+    "name" : "Penalties and Rewards Code",
+    "btId" : "OPP-033",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']/efbc:TermCode",
+    "xpathRelative" : "efbc:TermCode",
+    "type" : "code",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10317,41 +15800,51 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "OPA-98-Lot-Number",
-    "parentNodeId" : "ND-LotTenderingTerms",
-    "name" : "Numeric value of the tender validity deadline",
-    "btId" : "BT-98",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderValidityPeriod/cbc:DurationMeasure",
-    "xpathRelative" : "cac:TenderValidityPeriod/cbc:DurationMeasure",
-    "type" : "number",
-    "legalType" : "DURATION",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
     },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "rewards-penalties",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
-    "id" : "OPP-010-notice",
-    "parentNodeId" : "ND-Publication",
-    "name" : "Notice Publication Number",
-    "btId" : "OPP-010",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:NoticePublicationID[@schemeName='ojs-notice-id']",
-    "xpathRelative" : "efbc:NoticePublicationID[@schemeName='ojs-notice-id']",
-    "type" : "id",
+    "id" : "OPP-033-Tender-List",
+    "parentNodeId" : "ND-RewardsPenalties",
+    "name" : "Penalties and Rewards Code Listname",
+    "btId" : "OPP-033",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']/efbc:TermCode/@listName",
+    "xpathRelative" : "efbc:TermCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPP-033-Tender",
+    "presetValue" : "rewards-penalties",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPP-034-Tender",
+    "parentNodeId" : "ND-RewardsPenalties",
+    "name" : "Penalties and Rewards Description",
+    "btId" : "OPP-034",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']/efbc:TermDescription",
+    "xpathRelative" : "efbc:TermDescription",
+    "type" : "text-multilingual",
+    "maxLength" : 6000,
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10360,48 +15853,50 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^[1-9](\\d{0,7})-(19|20)\\d\\d$",
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "OPP-011-notice",
-    "parentNodeId" : "ND-Publication",
-    "name" : "OJEU Identifier",
-    "btId" : "OPP-011",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:GazetteID[@schemeName='ojs-id']",
-    "xpathRelative" : "efbc:GazetteID[@schemeName='ojs-id']",
-    "type" : "id",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "T02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
+    }
+  }, {
+    "id" : "OPP-034-Tender-Language",
+    "parentNodeId" : "ND-RewardsPenalties",
+    "name" : "Penalties and Rewards Description Language",
+    "btId" : "OPP-034",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']/efbc:TermDescription/@languageID",
+    "xpathRelative" : "efbc:TermDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPP-034-Tender",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
     },
-    "pattern" : {
-      "value" : "^[1-9]\\d{0,2}/(19|20)\\d\\d$",
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "OPP-012-notice",
-    "parentNodeId" : "ND-Publication",
-    "name" : "OJEU Publication Date",
-    "btId" : "OPP-012",
-    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Publication/efbc:PublicationDate",
-    "xpathRelative" : "efbc:PublicationDate",
-    "type" : "date",
+    "id" : "OPP-035-Tender",
+    "parentNodeId" : "ND-RevenueAllocation",
+    "name" : "Revenues Allocation of tickets sales code",
+    "btId" : "OPP-035",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']/efbc:TermCode",
+    "xpathRelative" : "efbc:TermCode",
+    "type" : "code",
+    "presetValue" : "all-rev-tic",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10410,25 +15905,53 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "revenue-allocation",
+        "type" : "flat",
+        "parentId" : "contract-detail"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPP-035-Tender-List",
+    "parentNodeId" : "ND-RevenueAllocation",
+    "name" : "Revenues Allocation of tickets sales code Listname",
+    "btId" : "OPP-035",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']/efbc:TermCode/@listName",
+    "xpathRelative" : "efbc:TermCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPP-035-Tender",
+    "presetValue" : "contract-detail",
+    "repeatable" : {
+      "value" : false,
       "severity" : "ERROR"
     }
   }, {
     "id" : "OPP-040-Procedure",
-    "parentNodeId" : "ND-ProcedureProcurementScope",
+    "parentNodeId" : "ND-ProcedureTransportServiceType",
     "name" : "Main Nature - Sub Type",
     "btId" : "OPP-040",
-    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='transport-service']",
-    "xpathRelative" : "cac:ProcurementAdditionalType/cbc:ProcurementTypeCode[@listName='transport-service']",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
     "type" : "code",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
@@ -10456,6 +15979,21 @@
       },
       "severity" : "ERROR"
     }
+  }, {
+    "id" : "OPP-040-Procedure-List",
+    "parentNodeId" : "ND-ProcedureTransportServiceType",
+    "name" : "Main Nature - Sub Type Listname",
+    "btId" : "OPP-040",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPP-040-Procedure",
+    "presetValue" : "transport-service",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPP-050-Organization",
     "parentNodeId" : "ND-Organization",
@@ -10475,7 +16013,19 @@
         "noticeTypes" : [ "1", "2", "3", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40" ],
+        "condition" : "{ND-Organization} ${not(OPT-200-Organization-Company in OPT-300-Procedure-Buyer) or (count(OPT-300-Procedure-Buyer) < 2)}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
     "id" : "OPP-051-Organization",
@@ -10489,14 +16039,36 @@
       "value" : false,
       "severity" : "ERROR"
     },
-    "forbidden" : {
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "14", "19", "28", "32", "35", "40", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "15", "16", "17", "18", "20", "21", "22", "23", "24", "25", "26", "27", "29", "30", "31", "33", "34", "36", "37", "38", "39", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Organization} ${not(OPT-200-Organization-Company in OPT-300-Procedure-Buyer)}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "14", "19", "28", "32", "35", "40", "X01", "X02" ],
+        "noticeTypes" : [ "4", "5", "7", "8", "10", "13", "16", "17", "21", "23", "24", "25", "26", "29", "30", "34", "37" ],
+        "condition" : "{ND-Organization} ${(OPT-200-Organization-Company in OPT-300-Procedure-Buyer) and (BT-766-Lot == 'dps-nlist') and (BT-01-notice != 'other') and (OPP-052-Organization is not present)}",
         "value" : true,
         "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
     "id" : "OPP-052-Organization",
@@ -10517,7 +16089,19 @@
         "noticeTypes" : [ "1", "2", "3", "14", "19", "28", "32", "35", "40", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "15", "16", "17", "18", "20", "21", "22", "23", "24", "25", "26", "27", "29", "30", "31", "33", "34", "36", "37", "38", "39", "CEI", "T01", "T02" ],
+        "condition" : "{ND-Organization} ${not(OPT-200-Organization-Company in OPT-300-Procedure-Buyer)}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
     }
   }, {
     "id" : "OPP-070-notice",
@@ -10629,38 +16213,28 @@
       } ]
     }
   }, {
-    "id" : "OPP-090-Procedure",
-    "parentNodeId" : "ND-ProcedureTenderingProcess",
-    "name" : "Previous Notice Identifier",
-    "btId" : "OPP-090",
-    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID",
-    "xpathRelative" : "cac:NoticeDocumentReference/cbc:ID",
-    "type" : "id",
+    "id" : "OPP-070-notice-List",
+    "parentNodeId" : "ND-RootExtension",
+    "name" : "Notice Subtype Listname",
+    "btId" : "OPP-070",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeSubType/cbc:SubTypeCode/@listName",
+    "xpathRelative" : "efac:NoticeSubType/cbc:SubTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPP-070-notice",
+    "presetValue" : "notice-subtype",
     "repeatable" : {
-      "value" : true,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "pattern" : {
-      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|[1-9](\\d{0,7})-(19|20)\\d\\d)$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "OPP-100-Business",
-    "parentNodeId" : "ND-OperationType",
-    "name" : "Notice Purpose",
-    "btId" : "OPP-100",
-    "xpathAbsolute" : "/*/efac:NoticePurpose/cbc:PurposeCode",
-    "xpathRelative" : "cbc:PurposeCode",
-    "type" : "code",
+    "id" : "OPP-080-Tender",
+    "parentNodeId" : "ND-LotTender",
+    "name" : "Kilometers Public Transport",
+    "btId" : "OPP-080",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efbc:PublicTransportationCumulatedDistance",
+    "xpathRelative" : "efbc:PublicTransportationCumulatedDistance",
+    "type" : "integer",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10669,104 +16243,74 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
-    },
-    "mandatory" : {
+    }
+  }, {
+    "id" : "OPP-080-Tender-Unit",
+    "parentNodeId" : "ND-LotTender",
+    "name" : "Kilometers Public Transport Unit",
+    "btId" : "OPP-080",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efbc:PublicTransportationCumulatedDistance/@unitCode",
+    "xpathRelative" : "efbc:PublicTransportationCumulatedDistance/@unitCode",
+    "type" : "text",
+    "attributeName" : "unitCode",
+    "attributeOf" : "OPP-080-Tender",
+    "presetValue" : "km",
+    "repeatable" : {
       "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "codeList" : {
-      "value" : {
-        "id" : "notice-purpose",
-        "type" : "flat"
-      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "OPP-105-Business",
-    "parentNodeId" : "ND-Root",
-    "name" : "Sector of activity",
-    "btId" : "OPP-105",
-    "xpathAbsolute" : "/*/cac:BusinessCapability/cbc:CapabilityTypeCode",
-    "xpathRelative" : "cac:BusinessCapability/cbc:CapabilityTypeCode",
-    "type" : "code",
+    "id" : "OPP-090-Procedure",
+    "parentNodeId" : "ND-PreviousNoticeReference",
+    "name" : "Previous Notice Identifier",
+    "btId" : "OPP-090",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "type" : "id",
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "main-activity",
-        "type" : "flat"
-      },
+    "pattern" : {
+      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|(\\d{1,8})-(19|20)\\d\\d)$",
       "severity" : "ERROR"
     }
   }, {
-    "id" : "OPP-120-Business",
-    "parentNodeId" : "ND-GazetteReference",
-    "name" : "Name of Publication",
-    "btId" : "OPP-120",
-    "xpathAbsolute" : "/*/cac:AdditionalDocumentReference/cbc:DocumentDescription",
-    "xpathRelative" : "cbc:DocumentDescription",
+    "id" : "OPP-090-Procedure-Scheme",
+    "parentNodeId" : "ND-PreviousNoticeReference",
+    "name" : "Previous Notice Identifier Schemename",
+    "btId" : "OPP-090",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference/cbc:ID/@schemeName",
+    "xpathRelative" : "cbc:ID/@schemeName",
     "type" : "text",
-    "maxLength" : 400,
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPP-090-Procedure",
+    "presetValue" : "ojs-notice-id",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     }
   }, {
-    "id" : "OPP-121-Business",
-    "parentNodeId" : "ND-GazetteReference",
-    "name" : "Title of the announcement",
-    "btId" : "OPP-121",
-    "xpathAbsolute" : "/*/cac:AdditionalDocumentReference/cbc:ReferencedDocumentInternalAddress",
-    "xpathRelative" : "cbc:ReferencedDocumentInternalAddress",
-    "type" : "text",
-    "maxLength" : 400,
+    "id" : "OPP-100-Business",
+    "parentNodeId" : "ND-OperationType",
+    "name" : "Notice Purpose",
+    "btId" : "OPP-100",
+    "xpathAbsolute" : "/*/efac:NoticePurpose/cbc:PurposeCode",
+    "xpathRelative" : "cbc:PurposeCode",
+    "type" : "code",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10788,66 +16332,28 @@
         "value" : true,
         "severity" : "ERROR"
       } ]
-    }
-  }, {
-    "id" : "OPP-122-Business",
-    "parentNodeId" : "ND-GazetteReference",
-    "name" : "URL of the announcement",
-    "btId" : "OPP-122",
-    "xpathAbsolute" : "/*/cac:AdditionalDocumentReference/cac:Attachment/cac:ExternalReference/cbc:URI",
-    "xpathRelative" : "cac:Attachment/cac:ExternalReference/cbc:URI",
-    "type" : "url",
-    "maxLength" : 400,
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
     },
-    "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+    "codeList" : {
+      "value" : {
+        "id" : "notice-purpose",
+        "type" : "flat"
+      },
       "severity" : "ERROR"
     }
   }, {
-    "id" : "OPP-123-Business",
-    "parentNodeId" : "ND-GazetteReference",
-    "name" : "Date of publication",
-    "btId" : "OPP-123",
-    "xpathAbsolute" : "/*/cac:AdditionalDocumentReference/cbc:IssueDate",
-    "xpathRelative" : "cbc:IssueDate",
-    "type" : "date",
+    "id" : "OPP-100-Business-List",
+    "parentNodeId" : "ND-OperationType",
+    "name" : "Notice Purpose Listname",
+    "btId" : "OPP-100",
+    "xpathAbsolute" : "/*/efac:NoticePurpose/cbc:PurposeCode/@listName",
+    "xpathRelative" : "cbc:PurposeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPP-100-Business",
+    "presetValue" : "notice-purpose",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
-    },
-    "forbidden" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "X01", "X02" ],
-        "value" : true,
-        "severity" : "ERROR"
-      } ]
-    },
-    "pattern" : {
-      "value" : "^(?:(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:(?:0[13578]|1[02]))-31|(?:(?:0[13-9]|1[0-2])-(?:29|30))))|(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))-02-29))|(?:(?:(?:1[6-9]|[2-9]\\d)\\d{2})-(?:(?:0[1-9])|(?:1[0-2]))-(?:0[1-9]|1\\d|2[0-8])))(Z|[-+]((0[0-9]|1[0-3]):([03]0|45)|14:00))$",
-      "severity" : "ERROR"
     }
   }, {
     "id" : "OPP-130-Business",
@@ -10871,6 +16377,27 @@
         "severity" : "ERROR"
       } ]
     }
+  }, {
+    "id" : "OPP-130-Business-Language",
+    "parentNodeId" : "ND-Root",
+    "name" : "Additional information Language",
+    "btId" : "OPP-130",
+    "xpathAbsolute" : "/*/cbc:Note/@languageID",
+    "xpathRelative" : "cbc:Note/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPP-130-Business",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPP-131-Business",
     "parentNodeId" : "ND-SenderContact",
@@ -10949,7 +16476,7 @@
       } ]
     },
     "pattern" : {
-      "value" : "^eforms-sdk-\\d\\.\\d$",
+      "value" : "^eforms-sdk-\\d+\\.\\d+$",
       "severity" : "ERROR"
     }
   }, {
@@ -10982,13 +16509,30 @@
       "severity" : "ERROR"
     }
   }, {
-    "id" : "OPT-050-Lot",
-    "parentNodeId" : "ND-LotProcurementDocument",
-    "name" : "Document Status",
-    "btId" : "OPT-050",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentStatusCode",
-    "xpathRelative" : "cbc:DocumentStatusCode",
+    "id" : "OPT-030-Procedure-SProvider-List",
+    "parentNodeId" : "ND-ServiceProviderParty",
+    "name" : "Provided Service Type Listname",
+    "btId" : "OPT-030",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cbc:ServiceTypeCode/@listName",
+    "xpathRelative" : "cbc:ServiceTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPT-030-Procedure-SProvider",
+    "presetValue" : "organisation-role",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-060-Lot",
+    "parentNodeId" : "ND-ExecutionRequirements",
+    "name" : "Execution Requirements Factor",
+    "btId" : "OPT-060",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']/cbc:ExecutionRequirementCode",
+    "xpathRelative" : "cbc:ExecutionRequirementCode",
     "type" : "code",
+    "presetValue" : "performance",
+    "legalType" : "CODE",
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -10997,49 +16541,46 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
-    "codeList" : {
-      "value" : {
-        "id" : "document-status",
-        "type" : "flat"
-      },
-      "severity" : "ERROR"
-    }
-  }, {
-    "id" : "OPT-050-Part",
-    "parentNodeId" : "ND-PartProcurementDocument",
-    "name" : "Document Status",
-    "btId" : "OPT-050",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:CallForTendersDocumentReference/cbc:DocumentStatusCode",
-    "xpathRelative" : "cbc:DocumentStatusCode",
-    "type" : "code",
-    "repeatable" : {
-      "value" : false,
-      "severity" : "ERROR"
-    },
-    "forbidden" : {
+    "mandatory" : {
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "17", "18", "22" ],
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "document-status",
+        "id" : "conditions",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
+  }, {
+    "id" : "OPT-060-Lot-List",
+    "parentNodeId" : "ND-ExecutionRequirements",
+    "name" : "Execution Requirements Factor Listname",
+    "btId" : "OPT-060",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']/cbc:ExecutionRequirementCode/@listName",
+    "xpathRelative" : "cbc:ExecutionRequirementCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPT-060-Lot",
+    "presetValue" : "conditions",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-070-Lot",
-    "parentNodeId" : "ND-ReservedExecution",
+    "parentNodeId" : "ND-LotReservedExecution",
     "name" : "Reserved Execution justification",
     "btId" : "OPT-070",
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']/cbc:Description",
@@ -11059,6 +16600,27 @@
         "severity" : "ERROR"
       } ]
     }
+  }, {
+    "id" : "OPT-070-Lot-Language",
+    "parentNodeId" : "ND-LotReservedExecution",
+    "name" : "Reserved Execution justification Language",
+    "btId" : "OPT-070",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPT-070-Lot",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-071-Lot",
     "parentNodeId" : "ND-QualityTarget",
@@ -11096,6 +16658,21 @@
       },
       "severity" : "ERROR"
     }
+  }, {
+    "id" : "OPT-071-Lot-List",
+    "parentNodeId" : "ND-QualityTarget",
+    "name" : "Quality Target Code Listname",
+    "btId" : "OPT-071",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']/cbc:ExecutionRequirementCode/@listName",
+    "xpathRelative" : "cbc:ExecutionRequirementCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPT-071-Lot",
+    "presetValue" : "customer-service",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-072-Lot",
     "parentNodeId" : "ND-QualityTarget",
@@ -11127,6 +16704,27 @@
         "severity" : "ERROR"
       } ]
     }
+  }, {
+    "id" : "OPT-072-Lot-Language",
+    "parentNodeId" : "ND-QualityTarget",
+    "name" : "Quality Target Description Language",
+    "btId" : "OPT-072",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']/cbc:Description/@languageID",
+    "xpathRelative" : "cbc:Description/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPT-072-Lot",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-090-Lot",
     "parentNodeId" : "ND-FABuyerCategories",
@@ -11185,6 +16783,21 @@
       },
       "severity" : "ERROR"
     }
+  }, {
+    "id" : "OPT-091-ReviewReq-List",
+    "parentNodeId" : "ND-AppealingParty",
+    "name" : "Review Requester Type Listname",
+    "btId" : "OPT-091",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealingParty/efbc:AppealingPartyTypeCode/@listName",
+    "xpathRelative" : "efbc:AppealingPartyTypeCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPT-091-ReviewReq",
+    "presetValue" : "organisation-role",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-092-ReviewBody",
     "parentNodeId" : "ND-AppealProcessingParty",
@@ -11206,6 +16819,27 @@
         "severity" : "ERROR"
       } ]
     }
+  }, {
+    "id" : "OPT-092-ReviewBody-Language",
+    "parentNodeId" : "ND-AppealProcessingParty",
+    "name" : "Review Body Type Description Language",
+    "btId" : "OPT-092",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealProcessingParty/efbc:AppealProcessingPartyTypeDescription/@languageID",
+    "xpathRelative" : "efbc:AppealProcessingPartyTypeDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPT-092-ReviewBody",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-092-ReviewReq",
     "parentNodeId" : "ND-AppealingParty",
@@ -11227,6 +16861,87 @@
         "severity" : "ERROR"
       } ]
     }
+  }, {
+    "id" : "OPT-092-ReviewReq-Language",
+    "parentNodeId" : "ND-AppealingParty",
+    "name" : "Review Requester Type Description Language",
+    "btId" : "OPT-092",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AppealsInformation/efac:AppealStatus/efac:AppealingParty/efbc:AppealingPartyTypeDescription/@languageID",
+    "xpathRelative" : "efbc:AppealingPartyTypeDescription/@languageID",
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "OPT-092-ReviewReq",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-100-Contract",
+    "parentNodeId" : "ND-SettledContract",
+    "name" : "Framework Notice Identifier",
+    "btId" : "OPT-100",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/cac:NoticeDocumentReference/cbc:ID",
+    "xpathRelative" : "cac:NoticeDocumentReference/cbc:ID",
+    "type" : "id",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "29", "30", "31", "32", "33", "34", "35" ],
+        "condition" : "{ND-SettledContract} ${not(BT-768-Contract == TRUE)}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "29", "30", "31", "32", "33", "34", "35" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}-(0[1-9]|[1-9]\\d)|(\\d{1,8})-(19|20)\\d\\d)$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-100-Contract-Scheme",
+    "parentNodeId" : "ND-SettledContract",
+    "name" : "Framework Notice Identifier Schemename",
+    "btId" : "OPT-100",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/cac:NoticeDocumentReference/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:NoticeDocumentReference/cbc:ID/@schemeName",
+    "type" : "code",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-100-Contract",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "notice-reference",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-110-Lot-FiscalLegis",
     "parentNodeId" : "ND-LotFiscalLegislation",
@@ -11250,7 +16965,7 @@
       } ]
     },
     "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
@@ -11276,7 +16991,7 @@
       } ]
     },
     "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
@@ -11428,7 +17143,7 @@
       } ]
     },
     "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
@@ -11454,7 +17169,7 @@
       } ]
     },
     "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
@@ -11480,7 +17195,7 @@
       } ]
     },
     "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
@@ -11506,7 +17221,7 @@
       } ]
     },
     "pattern" : {
-      "value" : "^((((H|h)(T|t)|(F|f))(T|t)(P|p)((S|s)?)):(/){2})(www\\.)?([a-zA-Z0-9\\-]+\\.)+[a-zA-Z]{2,6}(\\W(.)*$|$)",
+      "value" : "((^(http|HTTP|https|HTTPS|ftp|FTP|ftps|FTPS|sftp|SFTP)://)|(^(w|W){3}(\\d)?\\.))[\\w\\?!\\./:;,\\-_=#+*%@&quot;\\(\\)&amp;]+",
       "severity" : "ERROR"
     }
   }, {
@@ -11528,6 +17243,20 @@
         "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "condition" : "{ND-LotProcurementDocument} ${BT-14-Lot is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     }
   }, {
@@ -11549,15 +17278,29 @@
         "noticeTypes" : [ "1", "2", "3", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "condition" : "{ND-PartProcurementDocument} ${BT-14-Part is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "4", "5", "6" ],
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     }
   }, {
-    "id" : "OPT-150-Lot",
-    "parentNodeId" : "ND-AllowedSubcontracting",
-    "name" : "Subcontracting Allowed",
-    "btId" : "OPT-150",
-    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']/cbc:SubcontractingConditionsCode",
-    "xpathRelative" : "cbc:SubcontractingConditionsCode",
+    "id" : "OPT-155-LotResult",
+    "parentNodeId" : "ND-ProcurementStatistics",
+    "name" : "Vehicle Type",
+    "btId" : "OPT-155",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics/efbc:StatisticsCode",
+    "xpathRelative" : "efbc:StatisticsCode",
     "type" : "code",
     "repeatable" : {
       "value" : false,
@@ -11567,27 +17310,64 @@
       "value" : false,
       "severity" : "ERROR",
       "constraints" : [ {
-        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "T01", "T02", "X01", "X02" ],
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
-      } ]
-    },
-    "mandatory" : {
-      "value" : false,
-      "severity" : "ERROR",
-      "constraints" : [ {
-        "noticeTypes" : [ "CEI" ],
+      }, {
+        "noticeTypes" : [ "29", "30", "31", "38", "39", "40" ],
+        "condition" : "{ND-ProcurementStatistics} ${BT-723-LotResult is not present}",
         "value" : true,
         "severity" : "ERROR"
       } ]
     },
     "codeList" : {
       "value" : {
-        "id" : "indicator",
+        "id" : "vehicles",
         "type" : "flat"
       },
       "severity" : "ERROR"
     }
+  }, {
+    "id" : "OPT-155-LotResult-List",
+    "parentNodeId" : "ND-ProcurementStatistics",
+    "name" : "Vehicle Type Listname",
+    "btId" : "OPT-155",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics/efbc:StatisticsCode/@listName",
+    "xpathRelative" : "efbc:StatisticsCode/@listName",
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "OPT-155-LotResult",
+    "presetValue" : "vehicles",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-156-LotResult",
+    "parentNodeId" : "ND-ProcurementStatistics",
+    "name" : "Vehicle Numeric",
+    "btId" : "OPT-156",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics/efbc:StatisticsNumeric",
+    "xpathRelative" : "efbc:StatisticsNumeric",
+    "type" : "number",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "32", "33", "34", "35", "36", "37", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "29", "30", "31", "38", "39", "40" ],
+        "condition" : "{ND-ProcurementStatistics} ${OPT-155-LotResult is not present}",
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
   }, {
     "id" : "OPT-160-UBO",
     "parentNodeId" : "ND-UBO",
@@ -11610,6 +17390,34 @@
         "severity" : "ERROR"
       } ]
     }
+  }, {
+    "id" : "OPT-170-Tenderer",
+    "parentNodeId" : "ND-Tenderer",
+    "name" : "Tendering Party Leader",
+    "btId" : "OPT-170",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:Tenderer/efbc:GroupLeadIndicator",
+    "xpathRelative" : "efbc:GroupLeadIndicator",
+    "type" : "indicator",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "CEI", "T01", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "indicator",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-200-Organization-Company",
     "parentNodeId" : "ND-Company",
@@ -11669,6 +17477,21 @@
         "message" : "rule|text|BR-OPT-00200-0103"
       } ]
     }
+  }, {
+    "id" : "OPT-200-Organization-Company-Scheme",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier Schemename",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-200-Organization-Company",
+    "presetValue" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-201-Organization-TouchPoint",
     "parentNodeId" : "ND-Touchpoint",
@@ -11711,6 +17534,21 @@
         "message" : "rule|text|BR-OPT-00201-0101"
       } ]
     }
+  }, {
+    "id" : "OPT-201-Organization-TouchPoint-Scheme",
+    "parentNodeId" : "ND-Touchpoint",
+    "name" : "TouchPoint Technical Identifier Schemename",
+    "btId" : "OPT-201",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID/@schemeName",
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-201-Organization-TouchPoint",
+    "presetValue" : "touchpoint",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-202-UBO",
     "parentNodeId" : "ND-UBO",
@@ -11761,7 +17599,6 @@
     "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -11784,6 +17621,10 @@
         "severity" : "ERROR"
       } ]
     },
+    "pattern" : {
+      "value" : "^ORG-\\d{4}$",
+      "severity" : "ERROR"
+    },
     "assert" : {
       "value" : "{ND-Root} ${TRUE}",
       "severity" : "ERROR",
@@ -11810,7 +17651,6 @@
     "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -11846,7 +17686,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -11891,7 +17730,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -11927,7 +17765,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -11964,6 +17801,27 @@
         "message" : "rule|text|BR-OPT-00301-1404"
       } ]
     }
+  }, {
+    "id" : "OPT-301-Lot-EmployLegis-Scheme",
+    "parentNodeId" : "ND-LotEmploymentLegislation",
+    "name" : "Employment Legislation Organization Technical Identifier Reference Schemename",
+    "btId" : "OPT-301",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "type" : "code",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-301-Lot-EmployLegis",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "player-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-301-Lot-EnvironLegis",
     "parentNodeId" : "ND-LotEnvironmentalLegislation",
@@ -11972,7 +17830,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12009,6 +17866,27 @@
         "message" : "rule|text|BR-OPT-00301-1406"
       } ]
     }
+  }, {
+    "id" : "OPT-301-Lot-EnvironLegis-Scheme",
+    "parentNodeId" : "ND-LotEnvironmentalLegislation",
+    "name" : "Environmental Legislation Organization Technical Identifier Reference Schemename",
+    "btId" : "OPT-301",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "type" : "code",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-301-Lot-EnvironLegis",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "player-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-301-Lot-FiscalLegis",
     "parentNodeId" : "ND-LotFiscalLegislation",
@@ -12017,7 +17895,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12054,6 +17931,27 @@
         "message" : "rule|text|BR-OPT-00301-1408"
       } ]
     }
+  }, {
+    "id" : "OPT-301-Lot-FiscalLegis-Scheme",
+    "parentNodeId" : "ND-LotFiscalLegislation",
+    "name" : "Fiscal Legislation Organization Technical Identifier Reference Schemename",
+    "btId" : "OPT-301",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "type" : "code",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-301-Lot-FiscalLegis",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "player-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-301-Lot-Mediator",
     "parentNodeId" : "ND-LotReviewTerms",
@@ -12062,7 +17960,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:MediationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:MediationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12090,6 +17987,27 @@
         "message" : "rule|text|BR-OPT-00301-1412"
       } ]
     }
+  }, {
+    "id" : "OPT-301-Lot-Mediator-Scheme",
+    "parentNodeId" : "ND-LotReviewTerms",
+    "name" : "Mediator Technical Identifier Reference Schemename",
+    "btId" : "OPT-301",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:MediationParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:MediationParty/cac:PartyIdentification/cbc:ID/@schemeName",
+    "type" : "code",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-301-Lot-Mediator",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "player-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
   }, {
     "id" : "OPT-301-Lot-ReviewInfo",
     "parentNodeId" : "ND-LotReviewTerms",
@@ -12098,7 +18016,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:AppealInformationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:AppealInformationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12134,7 +18051,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12179,7 +18095,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12215,7 +18130,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12251,7 +18165,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:AdditionalInformationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12287,7 +18200,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:DocumentProviderParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12323,7 +18235,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12368,7 +18279,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12413,7 +18323,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference/cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:IssuerParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12458,7 +18367,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AppealTerms/cac:MediationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:MediationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12494,7 +18402,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AppealTerms/cac:AppealInformationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:AppealInformationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12530,7 +18437,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:AppealTerms/cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:AppealReceiverParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12575,7 +18481,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:TenderEvaluationParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12611,7 +18516,6 @@
     "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Part']/cac:TenderingTerms/cac:TenderRecipientParty/cac:PartyIdentification/cbc:ID",
     "xpathRelative" : "cac:TenderRecipientParty/cac:PartyIdentification/cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "ORG", "TPO" ],
     "repeatable" : {
       "value" : false,
       "severity" : "ERROR"
@@ -12691,15 +18595,14 @@
     }
   }, {
     "id" : "OPT-302-Organization",
-    "parentNodeId" : "ND-Organization",
+    "parentNodeId" : "ND-OrganizationUboReference",
     "name" : "Beneficial Owner Reference",
     "btId" : "OPT-302",
     "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:UltimateBeneficialOwner/cbc:ID",
-    "xpathRelative" : "efac:UltimateBeneficialOwner/cbc:ID",
+    "xpathRelative" : "cbc:ID",
     "type" : "id-ref",
-    "idSchemes" : [ "UBO" ],
     "repeatable" : {
-      "value" : true,
+      "value" : false,
       "severity" : "ERROR"
     },
     "forbidden" : {
@@ -12709,6 +18612,11 @@
         "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "38", "39", "40", "CEI", "T01", "X01", "X02" ],
         "value" : true,
         "severity" : "ERROR"
+      }, {
+        "noticeTypes" : [ "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "T02" ],
+        "condition" : "{ND-Organization} ${(not(OPT-200-Organization-Company in OPT-300-Tenderer) and not(OPT-200-Organization-Company in OPT-301-Tenderer-SubCont)) or (BT-633-Organization == TRUE) or (BT-746-Organization == TRUE)}",
+        "value" : true,
+        "severity" : "ERROR"
       } ]
     },
     "pattern" : {
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/1.json b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/1.json
index c9d53f7..77a7151 100644
--- a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/1.json
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/1.json
@@ -1,9 +1,9 @@
 {
   "ublVersion" : "2.3",
-  "sdkVersion" : "1.6.0",
+  "sdkVersion" : "1.10.0-SNAPSHOT",
   "metadataDatabase" : {
-    "version" : "1.6.0",
-    "createdOn" : "2023-02-17T12:00:00"
+    "version" : "1.9.85",
+    "createdOn" : "2023-10-09T13:18:12"
   },
   "noticeId" : "1",
   "metadata" : [ {
@@ -262,12 +262,20 @@
           "description" : "Main Nature",
           "_label" : "field|name|BT-23-Procedure"
         }, {
-          "id" : "BT-531-Procedure",
-          "contentType" : "field",
-          "displayType" : "COMBOBOX",
-          "description" : "Additional Nature (different from Main)",
-          "_label" : "field|name|BT-531-Procedure",
-          "_repeatable" : true
+          "id" : "GR-Procedure-Additional-Nature",
+          "contentType" : "group",
+          "nodeId" : "ND-ProcedureContractAdditionalNature",
+          "displayType" : "GROUP",
+          "description" : "Additional contract nature for the Procedure",
+          "_label" : "group|name|ND-ProcedureContractAdditionalNature",
+          "_repeatable" : true,
+          "content" : [ {
+            "id" : "BT-531-Procedure",
+            "contentType" : "field",
+            "displayType" : "COMBOBOX",
+            "description" : "Additional Nature (different from Main)",
+            "_label" : "field|name|BT-531-Procedure"
+          } ]
         } ]
       }, {
         "id" : "GR-Procedure-Scope",
@@ -280,8 +288,8 @@
           "contentType" : "group",
           "nodeId" : "ND-ProcedureMainClassification",
           "displayType" : "GROUP",
-          "description" : "Main Classification",
-          "_label" : "group|name|GR-Procedure-Scope-MainClassification",
+          "description" : "Classification for the Main Commodity of the Procedure",
+          "_label" : "group|name|ND-ProcedureMainClassification",
           "content" : [ {
             "id" : "BT-26(m)-Procedure",
             "contentType" : "field",
@@ -437,12 +445,20 @@
       "_label" : "group|name|ND-Change",
       "_repeatable" : true,
       "content" : [ {
-        "id" : "BT-13716-notice",
-        "contentType" : "field",
-        "displayType" : "TEXTBOX",
-        "description" : "Change Previous Section Identifier",
-        "_label" : "field|name|BT-13716-notice",
-        "_repeatable" : true
+        "id" : "GR-ChangedSectionIdentifiers",
+        "contentType" : "group",
+        "nodeId" : "ND-ChangedSection",
+        "displayType" : "GROUP",
+        "description" : "Section subject to change",
+        "_label" : "group|name|ND-ChangedSection",
+        "_repeatable" : true,
+        "content" : [ {
+          "id" : "BT-13716-notice",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Change Previous Section Identifier",
+          "_label" : "field|name|BT-13716-notice"
+        } ]
       }, {
         "id" : "BT-141(a)-notice",
         "contentType" : "field",
@@ -470,284 +486,279 @@
     "description" : "Organisations",
     "_label" : "group|name|GR-Organisations-Section",
     "content" : [ {
-      "id" : "GR-Organisations-Subsection",
+      "id" : "GR-Organisations",
       "contentType" : "group",
-      "displayType" : "SECTION",
-      "description" : "Organisations",
-      "_label" : "group|name|GR-Organisations-Subsection",
+      "nodeId" : "ND-Organization",
+      "displayType" : "GROUP",
+      "description" : "A Party involved in the Competition from either side (Buyer or Tenderer) with a Legal Entity (Company) and possibly additional Contact Points (touchpoints)",
+      "_label" : "group|name|ND-Organization",
+      "_idScheme" : "ORG",
+      "_schemeName" : "organization",
+      "_identifierFieldId" : "OPT-200-Organization-Company",
+      "_repeatable" : true,
       "content" : [ {
-        "id" : "GR-Organisations",
-        "contentType" : "group",
-        "nodeId" : "ND-Organization",
-        "displayType" : "GROUP",
-        "description" : "A Party involved in the Competition from either side (Buyer or Tenderer) with a Legal Entity (Company) and possibly additional Contact Points (touchpoints)",
-        "_label" : "group|name|ND-Organization",
+        "id" : "OPT-200-Organization-Company",
+        "contentType" : "field",
+        "displayType" : "TEXTBOX",
+        "description" : "Organisation Technical Identifier",
+        "_label" : "field|name|OPT-200-Organization-Company",
         "_idScheme" : "ORG",
         "_schemeName" : "organization",
-        "_identifierFieldId" : "OPT-200-Organization-Company",
-        "_captionFieldId" : "BT-500-Organization-Company",
-        "_repeatable" : true,
+        "hidden" : true
+      }, {
+        "id" : "GR-Company",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation",
+        "_label" : "group|name|GR-Company",
         "content" : [ {
-          "id" : "OPT-200-Organization-Company",
-          "contentType" : "field",
-          "displayType" : "TEXTBOX",
-          "description" : "Organisation Technical Identifier",
-          "_label" : "field|name|OPT-200-Organization-Company",
-          "_idScheme" : "ORG",
-          "_schemeName" : "organization",
-          "hidden" : true
-        }, {
-          "id" : "BT-633-Organization",
+          "id" : "BT-500-Organization-Company",
           "contentType" : "field",
-          "displayType" : "RADIO",
-          "description" : "Organisation Natural Person",
-          "_label" : "field|name|BT-633-Organization"
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Name",
+          "_label" : "field|name|BT-500-Organization-Company"
         }, {
-          "id" : "GR-Company",
+          "id" : "GR-Organisation-Identifier",
           "contentType" : "group",
+          "nodeId" : "ND-CompanyLegalEntity",
           "displayType" : "GROUP",
-          "description" : "Organisation",
-          "_label" : "group|name|GR-Company",
+          "description" : "Company legal identifier",
+          "_label" : "group|name|ND-CompanyLegalEntity",
+          "_repeatable" : true,
           "content" : [ {
-            "id" : "BT-500-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Organisation Name",
-            "_label" : "field|name|BT-500-Organization-Company"
-          }, {
             "id" : "BT-501-Organization-Company",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
             "description" : "Organisation Identifier",
-            "_label" : "field|name|BT-501-Organization-Company",
-            "_repeatable" : true
-          }, {
-            "id" : "BT-16-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Organisation Part Name",
-            "_label" : "field|name|BT-16-Organization-Company"
-          }, {
-            "id" : "BT-505-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Internet Address",
-            "_label" : "field|name|BT-505-Organization-Company"
-          }, {
-            "id" : "BT-509-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation eDelivery Gateway",
-            "_label" : "field|name|BT-509-Organization-Company"
+            "_label" : "field|name|BT-501-Organization-Company"
           } ]
         }, {
-          "id" : "GR-Company-Address",
+          "id" : "BT-16-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Part Name",
+          "_label" : "field|name|BT-16-Organization-Company"
+        }, {
+          "id" : "BT-505-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Internet Address",
+          "_label" : "field|name|BT-505-Organization-Company"
+        }, {
+          "id" : "BT-509-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation eDelivery Gateway",
+          "_label" : "field|name|BT-509-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Company-Address",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation Address",
+        "_label" : "group|name|GR-Company-Address",
+        "content" : [ {
+          "id" : "BT-510(a)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Street",
+          "_label" : "field|name|BT-510(a)-Organization-Company"
+        }, {
+          "id" : "BT-510(b)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Streetline 1",
+          "_label" : "field|name|BT-510(b)-Organization-Company"
+        }, {
+          "id" : "BT-510(c)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Streetline 2",
+          "_label" : "field|name|BT-510(c)-Organization-Company"
+        }, {
+          "id" : "BT-513-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation City",
+          "_label" : "field|name|BT-513-Organization-Company"
+        }, {
+          "id" : "BT-512-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Post Code",
+          "_label" : "field|name|BT-512-Organization-Company"
+        }, {
+          "id" : "BT-507-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "COMBOBOX",
+          "description" : "Organisation Country Subdivision",
+          "_label" : "field|name|BT-507-Organization-Company"
+        }, {
+          "id" : "BT-514-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "COMBOBOX",
+          "description" : "Organisation Country Code",
+          "_label" : "field|name|BT-514-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Company-Contact",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation Contact",
+        "_label" : "group|name|GR-Company-Contact",
+        "content" : [ {
+          "id" : "BT-502-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Contact Point",
+          "_label" : "field|name|BT-502-Organization-Company"
+        }, {
+          "id" : "BT-506-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Email Address",
+          "_label" : "field|name|BT-506-Organization-Company"
+        }, {
+          "id" : "BT-503-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Telephone Number",
+          "_label" : "field|name|BT-503-Organization-Company"
+        }, {
+          "id" : "BT-739-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Fax",
+          "_label" : "field|name|BT-739-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Touch-Point",
+        "contentType" : "group",
+        "nodeId" : "ND-Touchpoint",
+        "displayType" : "GROUP",
+        "description" : "Contact details associated to a given role",
+        "_label" : "group|name|ND-Touchpoint",
+        "_idScheme" : "TPO",
+        "_schemeName" : "touchpoint",
+        "_identifierFieldId" : "OPT-201-Organization-TouchPoint",
+        "_repeatable" : true,
+        "content" : [ {
+          "id" : "OPT-201-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "TouchPoint Technical Identifier",
+          "_label" : "field|name|OPT-201-Organization-TouchPoint",
+          "_idScheme" : "TPO",
+          "_schemeName" : "touchpoint",
+          "hidden" : true
+        }, {
+          "id" : "BT-500-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Name",
+          "_label" : "field|name|BT-500-Organization-TouchPoint"
+        }, {
+          "id" : "BT-16-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Part Name",
+          "_label" : "field|name|BT-16-Organization-TouchPoint"
+        }, {
+          "id" : "BT-505-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Internet Address",
+          "_label" : "field|name|BT-505-Organization-TouchPoint"
+        }, {
+          "id" : "BT-509-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "eDelivery Gateway",
+          "_label" : "field|name|BT-509-Organization-TouchPoint"
+        }, {
+          "id" : "GR-TouchPoint-Address",
           "contentType" : "group",
           "displayType" : "GROUP",
-          "description" : "Organisation Address",
-          "_label" : "group|name|GR-Company-Address",
+          "description" : "TouchPoint Address",
+          "_label" : "group|name|GR-TouchPoint-Address",
           "content" : [ {
-            "id" : "BT-510(a)-Organization-Company",
+            "id" : "BT-510(a)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Street",
-            "_label" : "field|name|BT-510(a)-Organization-Company"
+            "_label" : "field|name|BT-510(a)-Organization-TouchPoint"
           }, {
-            "id" : "BT-510(b)-Organization-Company",
+            "id" : "BT-510(b)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Streetline 1",
-            "_label" : "field|name|BT-510(b)-Organization-Company"
+            "_label" : "field|name|BT-510(b)-Organization-TouchPoint"
           }, {
-            "id" : "BT-510(c)-Organization-Company",
+            "id" : "BT-510(c)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Streetline 2",
-            "_label" : "field|name|BT-510(c)-Organization-Company"
+            "_label" : "field|name|BT-510(c)-Organization-TouchPoint"
           }, {
-            "id" : "BT-513-Organization-Company",
+            "id" : "BT-513-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation City",
-            "_label" : "field|name|BT-513-Organization-Company"
+            "description" : "City",
+            "_label" : "field|name|BT-513-Organization-TouchPoint"
           }, {
-            "id" : "BT-512-Organization-Company",
+            "id" : "BT-512-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation Post Code",
-            "_label" : "field|name|BT-512-Organization-Company"
+            "description" : "Post Code",
+            "_label" : "field|name|BT-512-Organization-TouchPoint"
           }, {
-            "id" : "BT-507-Organization-Company",
+            "id" : "BT-507-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "COMBOBOX",
-            "description" : "Organisation Country Subdivision",
-            "_label" : "field|name|BT-507-Organization-Company"
+            "description" : "Country Subdivision",
+            "_label" : "field|name|BT-507-Organization-TouchPoint"
           }, {
-            "id" : "BT-514-Organization-Company",
+            "id" : "BT-514-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "COMBOBOX",
-            "description" : "Organisation Country Code",
-            "_label" : "field|name|BT-514-Organization-Company"
+            "description" : "Country Code",
+            "_label" : "field|name|BT-514-Organization-TouchPoint"
           } ]
         }, {
-          "id" : "GR-Company-Contact",
+          "id" : "GR-TouchPoint-Contact",
           "contentType" : "group",
           "displayType" : "GROUP",
-          "description" : "Organisation Contact",
-          "_label" : "group|name|GR-Company-Contact",
+          "description" : "TouchPoint Contact",
+          "_label" : "group|name|GR-TouchPoint-Contact",
           "content" : [ {
-            "id" : "BT-502-Organization-Company",
+            "id" : "BT-502-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation Contact Point",
-            "_label" : "field|name|BT-502-Organization-Company"
+            "description" : "Contact Point",
+            "_label" : "field|name|BT-502-Organization-TouchPoint"
           }, {
-            "id" : "BT-506-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Email Address",
-            "_label" : "field|name|BT-506-Organization-Company"
-          }, {
-            "id" : "BT-503-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Telephone Number",
-            "_label" : "field|name|BT-503-Organization-Company"
-          }, {
-            "id" : "BT-739-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Fax",
-            "_label" : "field|name|BT-739-Organization-Company"
-          } ]
-        }, {
-          "id" : "GR-Touch-Point",
-          "contentType" : "group",
-          "nodeId" : "ND-Touchpoint",
-          "displayType" : "GROUP",
-          "description" : "Contact details associated to a given role",
-          "_label" : "group|name|ND-Touchpoint",
-          "_idScheme" : "TPO",
-          "_schemeName" : "touchpoint",
-          "_identifierFieldId" : "OPT-201-Organization-TouchPoint",
-          "_captionFieldId" : "BT-500-Organization-TouchPoint",
-          "_repeatable" : true,
-          "content" : [ {
-            "id" : "OPT-201-Organization-TouchPoint",
+            "id" : "BT-506-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "TouchPoint Technical Identifier",
-            "_label" : "field|name|OPT-201-Organization-TouchPoint",
-            "_idScheme" : "TPO",
-            "_schemeName" : "touchpoint",
-            "hidden" : true
-          }, {
-            "id" : "BT-500-Organization-TouchPoint",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Name",
-            "_label" : "field|name|BT-500-Organization-TouchPoint"
-          }, {
-            "id" : "BT-16-Organization-TouchPoint",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Part Name",
-            "_label" : "field|name|BT-16-Organization-TouchPoint"
+            "description" : "Contact Email Address",
+            "_label" : "field|name|BT-506-Organization-TouchPoint"
           }, {
-            "id" : "BT-505-Organization-TouchPoint",
+            "id" : "BT-503-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "Internet Address",
-            "_label" : "field|name|BT-505-Organization-TouchPoint"
+            "description" : "Contact Telephone Number",
+            "_label" : "field|name|BT-503-Organization-TouchPoint"
           }, {
-            "id" : "BT-509-Organization-TouchPoint",
+            "id" : "BT-739-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "eDelivery Gateway",
-            "_label" : "field|name|BT-509-Organization-TouchPoint"
-          }, {
-            "id" : "GR-TouchPoint-Address",
-            "contentType" : "group",
-            "displayType" : "GROUP",
-            "description" : "TouchPoint Address",
-            "_label" : "group|name|GR-TouchPoint-Address",
-            "content" : [ {
-              "id" : "BT-510(a)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Street",
-              "_label" : "field|name|BT-510(a)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-510(b)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Streetline 1",
-              "_label" : "field|name|BT-510(b)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-510(c)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Streetline 2",
-              "_label" : "field|name|BT-510(c)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-513-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "City",
-              "_label" : "field|name|BT-513-Organization-TouchPoint"
-            }, {
-              "id" : "BT-512-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Post Code",
-              "_label" : "field|name|BT-512-Organization-TouchPoint"
-            }, {
-              "id" : "BT-507-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "COMBOBOX",
-              "description" : "Country Subdivision",
-              "_label" : "field|name|BT-507-Organization-TouchPoint"
-            }, {
-              "id" : "BT-514-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "COMBOBOX",
-              "description" : "Country Code",
-              "_label" : "field|name|BT-514-Organization-TouchPoint"
-            } ]
-          }, {
-            "id" : "GR-TouchPoint-Contact",
-            "contentType" : "group",
-            "displayType" : "GROUP",
-            "description" : "TouchPoint Contact",
-            "_label" : "group|name|GR-TouchPoint-Contact",
-            "content" : [ {
-              "id" : "BT-502-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Contact Point",
-              "_label" : "field|name|BT-502-Organization-TouchPoint"
-            }, {
-              "id" : "BT-506-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Email Address",
-              "_label" : "field|name|BT-506-Organization-TouchPoint"
-            }, {
-              "id" : "BT-503-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Telephone Number",
-              "_label" : "field|name|BT-503-Organization-TouchPoint"
-            }, {
-              "id" : "BT-739-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Fax",
-              "_label" : "field|name|BT-739-Organization-TouchPoint"
-            } ]
+            "description" : "Contact Fax",
+            "_label" : "field|name|BT-739-Organization-TouchPoint"
           } ]
-        } ]
-      } ]
+        } ],
+        "_captionFieldId" : "BT-500-Organization-TouchPoint"
+      } ],
+      "_captionFieldId" : "BT-500-Organization-Company"
     } ]
   } ]
 }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/2.json b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/2.json
index 51a1f01..e044b0f 100644
--- a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/2.json
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/2.json
@@ -1,9 +1,9 @@
 {
   "ublVersion" : "2.3",
-  "sdkVersion" : "1.6.0",
+  "sdkVersion" : "1.10.0-SNAPSHOT",
   "metadataDatabase" : {
-    "version" : "1.6.0",
-    "createdOn" : "2023-02-17T12:00:00"
+    "version" : "1.9.85",
+    "createdOn" : "2023-10-09T13:18:12"
   },
   "noticeId" : "2",
   "metadata" : [ {
@@ -251,7 +251,8 @@
           "displayType" : "TEXTBOX",
           "description" : "Procedure Legal Basis (NoID)",
           "_label" : "field|name|BT-01(e)-Procedure",
-          "_presetValue" : "LocalLegalBasis"
+          "_presetValue" : "LocalLegalBasis",
+          "hidden" : true
         }, {
           "id" : "BT-01(f)-Procedure",
           "contentType" : "field",
@@ -290,12 +291,20 @@
           "description" : "Main Nature",
           "_label" : "field|name|BT-23-Procedure"
         }, {
-          "id" : "BT-531-Procedure",
-          "contentType" : "field",
-          "displayType" : "COMBOBOX",
-          "description" : "Additional Nature (different from Main)",
-          "_label" : "field|name|BT-531-Procedure",
-          "_repeatable" : true
+          "id" : "GR-Procedure-Additional-Nature",
+          "contentType" : "group",
+          "nodeId" : "ND-ProcedureContractAdditionalNature",
+          "displayType" : "GROUP",
+          "description" : "Additional contract nature for the Procedure",
+          "_label" : "group|name|ND-ProcedureContractAdditionalNature",
+          "_repeatable" : true,
+          "content" : [ {
+            "id" : "BT-531-Procedure",
+            "contentType" : "field",
+            "displayType" : "COMBOBOX",
+            "description" : "Additional Nature (different from Main)",
+            "_label" : "field|name|BT-531-Procedure"
+          } ]
         } ]
       }, {
         "id" : "GR-Procedure-Scope",
@@ -308,8 +317,8 @@
           "contentType" : "group",
           "nodeId" : "ND-ProcedureMainClassification",
           "displayType" : "GROUP",
-          "description" : "Main Classification",
-          "_label" : "group|name|GR-Procedure-Scope-MainClassification",
+          "description" : "Classification for the Main Commodity of the Procedure",
+          "_label" : "group|name|ND-ProcedureMainClassification",
           "content" : [ {
             "id" : "BT-26(m)-Procedure",
             "contentType" : "field",
@@ -465,12 +474,20 @@
       "_label" : "group|name|ND-Change",
       "_repeatable" : true,
       "content" : [ {
-        "id" : "BT-13716-notice",
-        "contentType" : "field",
-        "displayType" : "TEXTBOX",
-        "description" : "Change Previous Section Identifier",
-        "_label" : "field|name|BT-13716-notice",
-        "_repeatable" : true
+        "id" : "GR-ChangedSectionIdentifiers",
+        "contentType" : "group",
+        "nodeId" : "ND-ChangedSection",
+        "displayType" : "GROUP",
+        "description" : "Section subject to change",
+        "_label" : "group|name|ND-ChangedSection",
+        "_repeatable" : true,
+        "content" : [ {
+          "id" : "BT-13716-notice",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Change Previous Section Identifier",
+          "_label" : "field|name|BT-13716-notice"
+        } ]
       }, {
         "id" : "BT-141(a)-notice",
         "contentType" : "field",
@@ -498,284 +515,279 @@
     "description" : "Organisations",
     "_label" : "group|name|GR-Organisations-Section",
     "content" : [ {
-      "id" : "GR-Organisations-Subsection",
+      "id" : "GR-Organisations",
       "contentType" : "group",
-      "displayType" : "SECTION",
-      "description" : "Organisations",
-      "_label" : "group|name|GR-Organisations-Subsection",
+      "nodeId" : "ND-Organization",
+      "displayType" : "GROUP",
+      "description" : "A Party involved in the Competition from either side (Buyer or Tenderer) with a Legal Entity (Company) and possibly additional Contact Points (touchpoints)",
+      "_label" : "group|name|ND-Organization",
+      "_idScheme" : "ORG",
+      "_schemeName" : "organization",
+      "_identifierFieldId" : "OPT-200-Organization-Company",
+      "_repeatable" : true,
       "content" : [ {
-        "id" : "GR-Organisations",
-        "contentType" : "group",
-        "nodeId" : "ND-Organization",
-        "displayType" : "GROUP",
-        "description" : "A Party involved in the Competition from either side (Buyer or Tenderer) with a Legal Entity (Company) and possibly additional Contact Points (touchpoints)",
-        "_label" : "group|name|ND-Organization",
+        "id" : "OPT-200-Organization-Company",
+        "contentType" : "field",
+        "displayType" : "TEXTBOX",
+        "description" : "Organisation Technical Identifier",
+        "_label" : "field|name|OPT-200-Organization-Company",
         "_idScheme" : "ORG",
         "_schemeName" : "organization",
-        "_identifierFieldId" : "OPT-200-Organization-Company",
-        "_captionFieldId" : "BT-500-Organization-Company",
-        "_repeatable" : true,
+        "hidden" : true
+      }, {
+        "id" : "GR-Company",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation",
+        "_label" : "group|name|GR-Company",
         "content" : [ {
-          "id" : "OPT-200-Organization-Company",
+          "id" : "BT-500-Organization-Company",
           "contentType" : "field",
-          "displayType" : "TEXTBOX",
-          "description" : "Organisation Technical Identifier",
-          "_label" : "field|name|OPT-200-Organization-Company",
-          "_idScheme" : "ORG",
-          "_schemeName" : "organization",
-          "hidden" : true
-        }, {
-          "id" : "BT-633-Organization",
-          "contentType" : "field",
-          "displayType" : "RADIO",
-          "description" : "Organisation Natural Person",
-          "_label" : "field|name|BT-633-Organization"
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Name",
+          "_label" : "field|name|BT-500-Organization-Company"
         }, {
-          "id" : "GR-Company",
+          "id" : "GR-Organisation-Identifier",
           "contentType" : "group",
+          "nodeId" : "ND-CompanyLegalEntity",
           "displayType" : "GROUP",
-          "description" : "Organisation",
-          "_label" : "group|name|GR-Company",
+          "description" : "Company legal identifier",
+          "_label" : "group|name|ND-CompanyLegalEntity",
+          "_repeatable" : true,
           "content" : [ {
-            "id" : "BT-500-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Organisation Name",
-            "_label" : "field|name|BT-500-Organization-Company"
-          }, {
             "id" : "BT-501-Organization-Company",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
             "description" : "Organisation Identifier",
-            "_label" : "field|name|BT-501-Organization-Company",
-            "_repeatable" : true
-          }, {
-            "id" : "BT-16-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Organisation Part Name",
-            "_label" : "field|name|BT-16-Organization-Company"
-          }, {
-            "id" : "BT-505-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Internet Address",
-            "_label" : "field|name|BT-505-Organization-Company"
-          }, {
-            "id" : "BT-509-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation eDelivery Gateway",
-            "_label" : "field|name|BT-509-Organization-Company"
+            "_label" : "field|name|BT-501-Organization-Company"
           } ]
         }, {
-          "id" : "GR-Company-Address",
+          "id" : "BT-16-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Part Name",
+          "_label" : "field|name|BT-16-Organization-Company"
+        }, {
+          "id" : "BT-505-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Internet Address",
+          "_label" : "field|name|BT-505-Organization-Company"
+        }, {
+          "id" : "BT-509-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation eDelivery Gateway",
+          "_label" : "field|name|BT-509-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Company-Address",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation Address",
+        "_label" : "group|name|GR-Company-Address",
+        "content" : [ {
+          "id" : "BT-510(a)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Street",
+          "_label" : "field|name|BT-510(a)-Organization-Company"
+        }, {
+          "id" : "BT-510(b)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Streetline 1",
+          "_label" : "field|name|BT-510(b)-Organization-Company"
+        }, {
+          "id" : "BT-510(c)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Streetline 2",
+          "_label" : "field|name|BT-510(c)-Organization-Company"
+        }, {
+          "id" : "BT-513-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation City",
+          "_label" : "field|name|BT-513-Organization-Company"
+        }, {
+          "id" : "BT-512-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Post Code",
+          "_label" : "field|name|BT-512-Organization-Company"
+        }, {
+          "id" : "BT-507-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "COMBOBOX",
+          "description" : "Organisation Country Subdivision",
+          "_label" : "field|name|BT-507-Organization-Company"
+        }, {
+          "id" : "BT-514-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "COMBOBOX",
+          "description" : "Organisation Country Code",
+          "_label" : "field|name|BT-514-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Company-Contact",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation Contact",
+        "_label" : "group|name|GR-Company-Contact",
+        "content" : [ {
+          "id" : "BT-502-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Contact Point",
+          "_label" : "field|name|BT-502-Organization-Company"
+        }, {
+          "id" : "BT-506-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Email Address",
+          "_label" : "field|name|BT-506-Organization-Company"
+        }, {
+          "id" : "BT-503-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Telephone Number",
+          "_label" : "field|name|BT-503-Organization-Company"
+        }, {
+          "id" : "BT-739-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Fax",
+          "_label" : "field|name|BT-739-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Touch-Point",
+        "contentType" : "group",
+        "nodeId" : "ND-Touchpoint",
+        "displayType" : "GROUP",
+        "description" : "Contact details associated to a given role",
+        "_label" : "group|name|ND-Touchpoint",
+        "_idScheme" : "TPO",
+        "_schemeName" : "touchpoint",
+        "_identifierFieldId" : "OPT-201-Organization-TouchPoint",
+        "_repeatable" : true,
+        "content" : [ {
+          "id" : "OPT-201-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "TouchPoint Technical Identifier",
+          "_label" : "field|name|OPT-201-Organization-TouchPoint",
+          "_idScheme" : "TPO",
+          "_schemeName" : "touchpoint",
+          "hidden" : true
+        }, {
+          "id" : "BT-500-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Name",
+          "_label" : "field|name|BT-500-Organization-TouchPoint"
+        }, {
+          "id" : "BT-16-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Part Name",
+          "_label" : "field|name|BT-16-Organization-TouchPoint"
+        }, {
+          "id" : "BT-505-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Internet Address",
+          "_label" : "field|name|BT-505-Organization-TouchPoint"
+        }, {
+          "id" : "BT-509-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "eDelivery Gateway",
+          "_label" : "field|name|BT-509-Organization-TouchPoint"
+        }, {
+          "id" : "GR-TouchPoint-Address",
           "contentType" : "group",
           "displayType" : "GROUP",
-          "description" : "Organisation Address",
-          "_label" : "group|name|GR-Company-Address",
+          "description" : "TouchPoint Address",
+          "_label" : "group|name|GR-TouchPoint-Address",
           "content" : [ {
-            "id" : "BT-510(a)-Organization-Company",
+            "id" : "BT-510(a)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Street",
-            "_label" : "field|name|BT-510(a)-Organization-Company"
+            "_label" : "field|name|BT-510(a)-Organization-TouchPoint"
           }, {
-            "id" : "BT-510(b)-Organization-Company",
+            "id" : "BT-510(b)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Streetline 1",
-            "_label" : "field|name|BT-510(b)-Organization-Company"
+            "_label" : "field|name|BT-510(b)-Organization-TouchPoint"
           }, {
-            "id" : "BT-510(c)-Organization-Company",
+            "id" : "BT-510(c)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Streetline 2",
-            "_label" : "field|name|BT-510(c)-Organization-Company"
+            "_label" : "field|name|BT-510(c)-Organization-TouchPoint"
           }, {
-            "id" : "BT-513-Organization-Company",
+            "id" : "BT-513-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation City",
-            "_label" : "field|name|BT-513-Organization-Company"
+            "description" : "City",
+            "_label" : "field|name|BT-513-Organization-TouchPoint"
           }, {
-            "id" : "BT-512-Organization-Company",
+            "id" : "BT-512-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation Post Code",
-            "_label" : "field|name|BT-512-Organization-Company"
+            "description" : "Post Code",
+            "_label" : "field|name|BT-512-Organization-TouchPoint"
           }, {
-            "id" : "BT-507-Organization-Company",
+            "id" : "BT-507-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "COMBOBOX",
-            "description" : "Organisation Country Subdivision",
-            "_label" : "field|name|BT-507-Organization-Company"
+            "description" : "Country Subdivision",
+            "_label" : "field|name|BT-507-Organization-TouchPoint"
           }, {
-            "id" : "BT-514-Organization-Company",
+            "id" : "BT-514-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "COMBOBOX",
-            "description" : "Organisation Country Code",
-            "_label" : "field|name|BT-514-Organization-Company"
+            "description" : "Country Code",
+            "_label" : "field|name|BT-514-Organization-TouchPoint"
           } ]
         }, {
-          "id" : "GR-Company-Contact",
+          "id" : "GR-TouchPoint-Contact",
           "contentType" : "group",
           "displayType" : "GROUP",
-          "description" : "Organisation Contact",
-          "_label" : "group|name|GR-Company-Contact",
+          "description" : "TouchPoint Contact",
+          "_label" : "group|name|GR-TouchPoint-Contact",
           "content" : [ {
-            "id" : "BT-502-Organization-Company",
+            "id" : "BT-502-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation Contact Point",
-            "_label" : "field|name|BT-502-Organization-Company"
+            "description" : "Contact Point",
+            "_label" : "field|name|BT-502-Organization-TouchPoint"
           }, {
-            "id" : "BT-506-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Email Address",
-            "_label" : "field|name|BT-506-Organization-Company"
-          }, {
-            "id" : "BT-503-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Telephone Number",
-            "_label" : "field|name|BT-503-Organization-Company"
-          }, {
-            "id" : "BT-739-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Fax",
-            "_label" : "field|name|BT-739-Organization-Company"
-          } ]
-        }, {
-          "id" : "GR-Touch-Point",
-          "contentType" : "group",
-          "nodeId" : "ND-Touchpoint",
-          "displayType" : "GROUP",
-          "description" : "Contact details associated to a given role",
-          "_label" : "group|name|ND-Touchpoint",
-          "_idScheme" : "TPO",
-          "_schemeName" : "touchpoint",
-          "_identifierFieldId" : "OPT-201-Organization-TouchPoint",
-          "_captionFieldId" : "BT-500-Organization-TouchPoint",
-          "_repeatable" : true,
-          "content" : [ {
-            "id" : "OPT-201-Organization-TouchPoint",
+            "id" : "BT-506-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "TouchPoint Technical Identifier",
-            "_label" : "field|name|OPT-201-Organization-TouchPoint",
-            "_idScheme" : "TPO",
-            "_schemeName" : "touchpoint",
-            "hidden" : true
-          }, {
-            "id" : "BT-500-Organization-TouchPoint",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Name",
-            "_label" : "field|name|BT-500-Organization-TouchPoint"
-          }, {
-            "id" : "BT-16-Organization-TouchPoint",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Part Name",
-            "_label" : "field|name|BT-16-Organization-TouchPoint"
+            "description" : "Contact Email Address",
+            "_label" : "field|name|BT-506-Organization-TouchPoint"
           }, {
-            "id" : "BT-505-Organization-TouchPoint",
+            "id" : "BT-503-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "Internet Address",
-            "_label" : "field|name|BT-505-Organization-TouchPoint"
+            "description" : "Contact Telephone Number",
+            "_label" : "field|name|BT-503-Organization-TouchPoint"
           }, {
-            "id" : "BT-509-Organization-TouchPoint",
+            "id" : "BT-739-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "eDelivery Gateway",
-            "_label" : "field|name|BT-509-Organization-TouchPoint"
-          }, {
-            "id" : "GR-TouchPoint-Address",
-            "contentType" : "group",
-            "displayType" : "GROUP",
-            "description" : "TouchPoint Address",
-            "_label" : "group|name|GR-TouchPoint-Address",
-            "content" : [ {
-              "id" : "BT-510(a)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Street",
-              "_label" : "field|name|BT-510(a)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-510(b)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Streetline 1",
-              "_label" : "field|name|BT-510(b)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-510(c)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Streetline 2",
-              "_label" : "field|name|BT-510(c)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-513-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "City",
-              "_label" : "field|name|BT-513-Organization-TouchPoint"
-            }, {
-              "id" : "BT-512-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Post Code",
-              "_label" : "field|name|BT-512-Organization-TouchPoint"
-            }, {
-              "id" : "BT-507-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "COMBOBOX",
-              "description" : "Country Subdivision",
-              "_label" : "field|name|BT-507-Organization-TouchPoint"
-            }, {
-              "id" : "BT-514-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "COMBOBOX",
-              "description" : "Country Code",
-              "_label" : "field|name|BT-514-Organization-TouchPoint"
-            } ]
-          }, {
-            "id" : "GR-TouchPoint-Contact",
-            "contentType" : "group",
-            "displayType" : "GROUP",
-            "description" : "TouchPoint Contact",
-            "_label" : "group|name|GR-TouchPoint-Contact",
-            "content" : [ {
-              "id" : "BT-502-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Contact Point",
-              "_label" : "field|name|BT-502-Organization-TouchPoint"
-            }, {
-              "id" : "BT-506-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Email Address",
-              "_label" : "field|name|BT-506-Organization-TouchPoint"
-            }, {
-              "id" : "BT-503-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Telephone Number",
-              "_label" : "field|name|BT-503-Organization-TouchPoint"
-            }, {
-              "id" : "BT-739-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Fax",
-              "_label" : "field|name|BT-739-Organization-TouchPoint"
-            } ]
+            "description" : "Contact Fax",
+            "_label" : "field|name|BT-739-Organization-TouchPoint"
           } ]
-        } ]
-      } ]
+        } ],
+        "_captionFieldId" : "BT-500-Organization-TouchPoint"
+      } ],
+      "_captionFieldId" : "BT-500-Organization-Company"
     } ]
   } ]
 }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/3.json b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/3.json
index 89f3814..bc3a245 100644
--- a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/3.json
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/3.json
@@ -1,9 +1,9 @@
 {
   "ublVersion" : "2.3",
-  "sdkVersion" : "1.6.0",
+  "sdkVersion" : "1.10.0-SNAPSHOT",
   "metadataDatabase" : {
-    "version" : "1.6.0",
-    "createdOn" : "2023-02-17T12:00:00"
+    "version" : "1.9.85",
+    "createdOn" : "2023-10-09T13:18:12"
   },
   "noticeId" : "3",
   "metadata" : [ {
@@ -257,7 +257,8 @@
           "displayType" : "TEXTBOX",
           "description" : "Procedure Legal Basis (NoID)",
           "_label" : "field|name|BT-01(e)-Procedure",
-          "_presetValue" : "LocalLegalBasis"
+          "_presetValue" : "LocalLegalBasis",
+          "hidden" : true
         }, {
           "id" : "BT-01(f)-Procedure",
           "contentType" : "field",
@@ -296,12 +297,20 @@
           "description" : "Main Nature",
           "_label" : "field|name|BT-23-Procedure"
         }, {
-          "id" : "BT-531-Procedure",
-          "contentType" : "field",
-          "displayType" : "COMBOBOX",
-          "description" : "Additional Nature (different from Main)",
-          "_label" : "field|name|BT-531-Procedure",
-          "_repeatable" : true
+          "id" : "GR-Procedure-Additional-Nature",
+          "contentType" : "group",
+          "nodeId" : "ND-ProcedureContractAdditionalNature",
+          "displayType" : "GROUP",
+          "description" : "Additional contract nature for the Procedure",
+          "_label" : "group|name|ND-ProcedureContractAdditionalNature",
+          "_repeatable" : true,
+          "content" : [ {
+            "id" : "BT-531-Procedure",
+            "contentType" : "field",
+            "displayType" : "COMBOBOX",
+            "description" : "Additional Nature (different from Main)",
+            "_label" : "field|name|BT-531-Procedure"
+          } ]
         } ]
       }, {
         "id" : "GR-Procedure-Scope",
@@ -314,8 +323,8 @@
           "contentType" : "group",
           "nodeId" : "ND-ProcedureMainClassification",
           "displayType" : "GROUP",
-          "description" : "Main Classification",
-          "_label" : "group|name|GR-Procedure-Scope-MainClassification",
+          "description" : "Classification for the Main Commodity of the Procedure",
+          "_label" : "group|name|ND-ProcedureMainClassification",
           "content" : [ {
             "id" : "BT-26(m)-Procedure",
             "contentType" : "field",
@@ -471,12 +480,20 @@
       "_label" : "group|name|ND-Change",
       "_repeatable" : true,
       "content" : [ {
-        "id" : "BT-13716-notice",
-        "contentType" : "field",
-        "displayType" : "TEXTBOX",
-        "description" : "Change Previous Section Identifier",
-        "_label" : "field|name|BT-13716-notice",
-        "_repeatable" : true
+        "id" : "GR-ChangedSectionIdentifiers",
+        "contentType" : "group",
+        "nodeId" : "ND-ChangedSection",
+        "displayType" : "GROUP",
+        "description" : "Section subject to change",
+        "_label" : "group|name|ND-ChangedSection",
+        "_repeatable" : true,
+        "content" : [ {
+          "id" : "BT-13716-notice",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Change Previous Section Identifier",
+          "_label" : "field|name|BT-13716-notice"
+        } ]
       }, {
         "id" : "BT-141(a)-notice",
         "contentType" : "field",
@@ -504,284 +521,279 @@
     "description" : "Organisations",
     "_label" : "group|name|GR-Organisations-Section",
     "content" : [ {
-      "id" : "GR-Organisations-Subsection",
+      "id" : "GR-Organisations",
       "contentType" : "group",
-      "displayType" : "SECTION",
-      "description" : "Organisations",
-      "_label" : "group|name|GR-Organisations-Subsection",
+      "nodeId" : "ND-Organization",
+      "displayType" : "GROUP",
+      "description" : "A Party involved in the Competition from either side (Buyer or Tenderer) with a Legal Entity (Company) and possibly additional Contact Points (touchpoints)",
+      "_label" : "group|name|ND-Organization",
+      "_idScheme" : "ORG",
+      "_schemeName" : "organization",
+      "_identifierFieldId" : "OPT-200-Organization-Company",
+      "_repeatable" : true,
       "content" : [ {
-        "id" : "GR-Organisations",
-        "contentType" : "group",
-        "nodeId" : "ND-Organization",
-        "displayType" : "GROUP",
-        "description" : "A Party involved in the Competition from either side (Buyer or Tenderer) with a Legal Entity (Company) and possibly additional Contact Points (touchpoints)",
-        "_label" : "group|name|ND-Organization",
+        "id" : "OPT-200-Organization-Company",
+        "contentType" : "field",
+        "displayType" : "TEXTBOX",
+        "description" : "Organisation Technical Identifier",
+        "_label" : "field|name|OPT-200-Organization-Company",
         "_idScheme" : "ORG",
         "_schemeName" : "organization",
-        "_identifierFieldId" : "OPT-200-Organization-Company",
-        "_captionFieldId" : "BT-500-Organization-Company",
-        "_repeatable" : true,
+        "hidden" : true
+      }, {
+        "id" : "GR-Company",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation",
+        "_label" : "group|name|GR-Company",
         "content" : [ {
-          "id" : "OPT-200-Organization-Company",
+          "id" : "BT-500-Organization-Company",
           "contentType" : "field",
-          "displayType" : "TEXTBOX",
-          "description" : "Organisation Technical Identifier",
-          "_label" : "field|name|OPT-200-Organization-Company",
-          "_idScheme" : "ORG",
-          "_schemeName" : "organization",
-          "hidden" : true
-        }, {
-          "id" : "BT-633-Organization",
-          "contentType" : "field",
-          "displayType" : "RADIO",
-          "description" : "Organisation Natural Person",
-          "_label" : "field|name|BT-633-Organization"
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Name",
+          "_label" : "field|name|BT-500-Organization-Company"
         }, {
-          "id" : "GR-Company",
+          "id" : "GR-Organisation-Identifier",
           "contentType" : "group",
+          "nodeId" : "ND-CompanyLegalEntity",
           "displayType" : "GROUP",
-          "description" : "Organisation",
-          "_label" : "group|name|GR-Company",
+          "description" : "Company legal identifier",
+          "_label" : "group|name|ND-CompanyLegalEntity",
+          "_repeatable" : true,
           "content" : [ {
-            "id" : "BT-500-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Organisation Name",
-            "_label" : "field|name|BT-500-Organization-Company"
-          }, {
             "id" : "BT-501-Organization-Company",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
             "description" : "Organisation Identifier",
-            "_label" : "field|name|BT-501-Organization-Company",
-            "_repeatable" : true
-          }, {
-            "id" : "BT-16-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Organisation Part Name",
-            "_label" : "field|name|BT-16-Organization-Company"
-          }, {
-            "id" : "BT-505-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Internet Address",
-            "_label" : "field|name|BT-505-Organization-Company"
-          }, {
-            "id" : "BT-509-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation eDelivery Gateway",
-            "_label" : "field|name|BT-509-Organization-Company"
+            "_label" : "field|name|BT-501-Organization-Company"
           } ]
         }, {
-          "id" : "GR-Company-Address",
+          "id" : "BT-16-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Part Name",
+          "_label" : "field|name|BT-16-Organization-Company"
+        }, {
+          "id" : "BT-505-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Internet Address",
+          "_label" : "field|name|BT-505-Organization-Company"
+        }, {
+          "id" : "BT-509-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation eDelivery Gateway",
+          "_label" : "field|name|BT-509-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Company-Address",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation Address",
+        "_label" : "group|name|GR-Company-Address",
+        "content" : [ {
+          "id" : "BT-510(a)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Street",
+          "_label" : "field|name|BT-510(a)-Organization-Company"
+        }, {
+          "id" : "BT-510(b)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Streetline 1",
+          "_label" : "field|name|BT-510(b)-Organization-Company"
+        }, {
+          "id" : "BT-510(c)-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Streetline 2",
+          "_label" : "field|name|BT-510(c)-Organization-Company"
+        }, {
+          "id" : "BT-513-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation City",
+          "_label" : "field|name|BT-513-Organization-Company"
+        }, {
+          "id" : "BT-512-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Post Code",
+          "_label" : "field|name|BT-512-Organization-Company"
+        }, {
+          "id" : "BT-507-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "COMBOBOX",
+          "description" : "Organisation Country Subdivision",
+          "_label" : "field|name|BT-507-Organization-Company"
+        }, {
+          "id" : "BT-514-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "COMBOBOX",
+          "description" : "Organisation Country Code",
+          "_label" : "field|name|BT-514-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Company-Contact",
+        "contentType" : "group",
+        "displayType" : "GROUP",
+        "description" : "Organisation Contact",
+        "_label" : "group|name|GR-Company-Contact",
+        "content" : [ {
+          "id" : "BT-502-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Organisation Contact Point",
+          "_label" : "field|name|BT-502-Organization-Company"
+        }, {
+          "id" : "BT-506-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Email Address",
+          "_label" : "field|name|BT-506-Organization-Company"
+        }, {
+          "id" : "BT-503-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Telephone Number",
+          "_label" : "field|name|BT-503-Organization-Company"
+        }, {
+          "id" : "BT-739-Organization-Company",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Organisation Contact Fax",
+          "_label" : "field|name|BT-739-Organization-Company"
+        } ]
+      }, {
+        "id" : "GR-Touch-Point",
+        "contentType" : "group",
+        "nodeId" : "ND-Touchpoint",
+        "displayType" : "GROUP",
+        "description" : "Contact details associated to a given role",
+        "_label" : "group|name|ND-Touchpoint",
+        "_idScheme" : "TPO",
+        "_schemeName" : "touchpoint",
+        "_identifierFieldId" : "OPT-201-Organization-TouchPoint",
+        "_repeatable" : true,
+        "content" : [ {
+          "id" : "OPT-201-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "TouchPoint Technical Identifier",
+          "_label" : "field|name|OPT-201-Organization-TouchPoint",
+          "_idScheme" : "TPO",
+          "_schemeName" : "touchpoint",
+          "hidden" : true
+        }, {
+          "id" : "BT-500-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Name",
+          "_label" : "field|name|BT-500-Organization-TouchPoint"
+        }, {
+          "id" : "BT-16-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTAREA",
+          "description" : "Part Name",
+          "_label" : "field|name|BT-16-Organization-TouchPoint"
+        }, {
+          "id" : "BT-505-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "Internet Address",
+          "_label" : "field|name|BT-505-Organization-TouchPoint"
+        }, {
+          "id" : "BT-509-Organization-TouchPoint",
+          "contentType" : "field",
+          "displayType" : "TEXTBOX",
+          "description" : "eDelivery Gateway",
+          "_label" : "field|name|BT-509-Organization-TouchPoint"
+        }, {
+          "id" : "GR-TouchPoint-Address",
           "contentType" : "group",
           "displayType" : "GROUP",
-          "description" : "Organisation Address",
-          "_label" : "group|name|GR-Company-Address",
+          "description" : "TouchPoint Address",
+          "_label" : "group|name|GR-TouchPoint-Address",
           "content" : [ {
-            "id" : "BT-510(a)-Organization-Company",
+            "id" : "BT-510(a)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Street",
-            "_label" : "field|name|BT-510(a)-Organization-Company"
+            "_label" : "field|name|BT-510(a)-Organization-TouchPoint"
           }, {
-            "id" : "BT-510(b)-Organization-Company",
+            "id" : "BT-510(b)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Streetline 1",
-            "_label" : "field|name|BT-510(b)-Organization-Company"
+            "_label" : "field|name|BT-510(b)-Organization-TouchPoint"
           }, {
-            "id" : "BT-510(c)-Organization-Company",
+            "id" : "BT-510(c)-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
             "description" : "Streetline 2",
-            "_label" : "field|name|BT-510(c)-Organization-Company"
+            "_label" : "field|name|BT-510(c)-Organization-TouchPoint"
           }, {
-            "id" : "BT-513-Organization-Company",
+            "id" : "BT-513-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation City",
-            "_label" : "field|name|BT-513-Organization-Company"
+            "description" : "City",
+            "_label" : "field|name|BT-513-Organization-TouchPoint"
           }, {
-            "id" : "BT-512-Organization-Company",
+            "id" : "BT-512-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation Post Code",
-            "_label" : "field|name|BT-512-Organization-Company"
+            "description" : "Post Code",
+            "_label" : "field|name|BT-512-Organization-TouchPoint"
           }, {
-            "id" : "BT-507-Organization-Company",
+            "id" : "BT-507-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "COMBOBOX",
-            "description" : "Organisation Country Subdivision",
-            "_label" : "field|name|BT-507-Organization-Company"
+            "description" : "Country Subdivision",
+            "_label" : "field|name|BT-507-Organization-TouchPoint"
           }, {
-            "id" : "BT-514-Organization-Company",
+            "id" : "BT-514-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "COMBOBOX",
-            "description" : "Organisation Country Code",
-            "_label" : "field|name|BT-514-Organization-Company"
+            "description" : "Country Code",
+            "_label" : "field|name|BT-514-Organization-TouchPoint"
           } ]
         }, {
-          "id" : "GR-Company-Contact",
+          "id" : "GR-TouchPoint-Contact",
           "contentType" : "group",
           "displayType" : "GROUP",
-          "description" : "Organisation Contact",
-          "_label" : "group|name|GR-Company-Contact",
+          "description" : "TouchPoint Contact",
+          "_label" : "group|name|GR-TouchPoint-Contact",
           "content" : [ {
-            "id" : "BT-502-Organization-Company",
+            "id" : "BT-502-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTAREA",
-            "description" : "Organisation Contact Point",
-            "_label" : "field|name|BT-502-Organization-Company"
+            "description" : "Contact Point",
+            "_label" : "field|name|BT-502-Organization-TouchPoint"
           }, {
-            "id" : "BT-506-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Email Address",
-            "_label" : "field|name|BT-506-Organization-Company"
-          }, {
-            "id" : "BT-503-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Telephone Number",
-            "_label" : "field|name|BT-503-Organization-Company"
-          }, {
-            "id" : "BT-739-Organization-Company",
-            "contentType" : "field",
-            "displayType" : "TEXTBOX",
-            "description" : "Organisation Contact Fax",
-            "_label" : "field|name|BT-739-Organization-Company"
-          } ]
-        }, {
-          "id" : "GR-Touch-Point",
-          "contentType" : "group",
-          "nodeId" : "ND-Touchpoint",
-          "displayType" : "GROUP",
-          "description" : "Contact details associated to a given role",
-          "_label" : "group|name|ND-Touchpoint",
-          "_idScheme" : "TPO",
-          "_schemeName" : "touchpoint",
-          "_identifierFieldId" : "OPT-201-Organization-TouchPoint",
-          "_captionFieldId" : "BT-500-Organization-TouchPoint",
-          "_repeatable" : true,
-          "content" : [ {
-            "id" : "OPT-201-Organization-TouchPoint",
+            "id" : "BT-506-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "TouchPoint Technical Identifier",
-            "_label" : "field|name|OPT-201-Organization-TouchPoint",
-            "_idScheme" : "TPO",
-            "_schemeName" : "touchpoint",
-            "hidden" : true
-          }, {
-            "id" : "BT-500-Organization-TouchPoint",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Name",
-            "_label" : "field|name|BT-500-Organization-TouchPoint"
-          }, {
-            "id" : "BT-16-Organization-TouchPoint",
-            "contentType" : "field",
-            "displayType" : "TEXTAREA",
-            "description" : "Part Name",
-            "_label" : "field|name|BT-16-Organization-TouchPoint"
+            "description" : "Contact Email Address",
+            "_label" : "field|name|BT-506-Organization-TouchPoint"
           }, {
-            "id" : "BT-505-Organization-TouchPoint",
+            "id" : "BT-503-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "Internet Address",
-            "_label" : "field|name|BT-505-Organization-TouchPoint"
+            "description" : "Contact Telephone Number",
+            "_label" : "field|name|BT-503-Organization-TouchPoint"
           }, {
-            "id" : "BT-509-Organization-TouchPoint",
+            "id" : "BT-739-Organization-TouchPoint",
             "contentType" : "field",
             "displayType" : "TEXTBOX",
-            "description" : "eDelivery Gateway",
-            "_label" : "field|name|BT-509-Organization-TouchPoint"
-          }, {
-            "id" : "GR-TouchPoint-Address",
-            "contentType" : "group",
-            "displayType" : "GROUP",
-            "description" : "TouchPoint Address",
-            "_label" : "group|name|GR-TouchPoint-Address",
-            "content" : [ {
-              "id" : "BT-510(a)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Street",
-              "_label" : "field|name|BT-510(a)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-510(b)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Streetline 1",
-              "_label" : "field|name|BT-510(b)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-510(c)-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Streetline 2",
-              "_label" : "field|name|BT-510(c)-Organization-TouchPoint"
-            }, {
-              "id" : "BT-513-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "City",
-              "_label" : "field|name|BT-513-Organization-TouchPoint"
-            }, {
-              "id" : "BT-512-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Post Code",
-              "_label" : "field|name|BT-512-Organization-TouchPoint"
-            }, {
-              "id" : "BT-507-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "COMBOBOX",
-              "description" : "Country Subdivision",
-              "_label" : "field|name|BT-507-Organization-TouchPoint"
-            }, {
-              "id" : "BT-514-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "COMBOBOX",
-              "description" : "Country Code",
-              "_label" : "field|name|BT-514-Organization-TouchPoint"
-            } ]
-          }, {
-            "id" : "GR-TouchPoint-Contact",
-            "contentType" : "group",
-            "displayType" : "GROUP",
-            "description" : "TouchPoint Contact",
-            "_label" : "group|name|GR-TouchPoint-Contact",
-            "content" : [ {
-              "id" : "BT-502-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTAREA",
-              "description" : "Contact Point",
-              "_label" : "field|name|BT-502-Organization-TouchPoint"
-            }, {
-              "id" : "BT-506-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Email Address",
-              "_label" : "field|name|BT-506-Organization-TouchPoint"
-            }, {
-              "id" : "BT-503-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Telephone Number",
-              "_label" : "field|name|BT-503-Organization-TouchPoint"
-            }, {
-              "id" : "BT-739-Organization-TouchPoint",
-              "contentType" : "field",
-              "displayType" : "TEXTBOX",
-              "description" : "Contact Fax",
-              "_label" : "field|name|BT-739-Organization-TouchPoint"
-            } ]
+            "description" : "Contact Fax",
+            "_label" : "field|name|BT-739-Organization-TouchPoint"
           } ]
-        } ]
-      } ]
+        } ],
+        "_captionFieldId" : "BT-500-Organization-TouchPoint"
+      } ],
+      "_captionFieldId" : "BT-500-Organization-Company"
     } ]
   } ]
 }
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/38.json b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/38.json
new file mode 100644
index 0000000..6c3272a
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/38.json
@@ -0,0 +1,184 @@
+{
+  "ublVersion" : "2.3",
+  "sdkVersion" : "1.10.0-SNAPSHOT",
+  "metadataDatabase" : {
+    "version" : "1.9.85",
+    "createdOn" : "2023-10-09T13:18:12"
+  },
+  "noticeId" : "38",
+  "metadata" : [ {
+    "id" : "BT-02-notice",
+    "contentType" : "field",
+    "displayType" : "COMBOBOX",
+    "description" : "Notice Type",
+    "_label" : "field|name|BT-02-notice",
+    "readOnly" : true
+  }, {
+    "id" : "BT-03-notice",
+    "contentType" : "field",
+    "displayType" : "COMBOBOX",
+    "description" : "Form Type",
+    "_label" : "field|name|BT-03-notice",
+    "readOnly" : true
+  }, {
+    "id" : "BT-04-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Procedure Identifier",
+    "_label" : "field|name|BT-04-notice",
+    "readOnly" : true
+  }, {
+    "id" : "BT-701-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Notice Identifier",
+    "_label" : "field|name|BT-701-notice",
+    "readOnly" : true
+  }, {
+    "id" : "BT-757-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Notice Version",
+    "_label" : "field|name|BT-757-notice",
+    "readOnly" : true
+  }, {
+    "id" : "BT-702(a)-notice",
+    "contentType" : "field",
+    "displayType" : "COMBOBOX",
+    "description" : "Notice Official Language",
+    "_label" : "field|name|BT-702(a)-notice",
+    "hidden" : true
+  }, {
+    "id" : "BT-702(b)-notice",
+    "contentType" : "field",
+    "displayType" : "COMBOBOX",
+    "description" : "Notice Official Language",
+    "_label" : "field|name|BT-702(b)-notice",
+    "_repeatable" : true,
+    "hidden" : true
+  }, {
+    "id" : "BT-05(a)-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Notice Dispatch Date",
+    "_label" : "field|name|BT-05(a)-notice",
+    "_presetValue" : "{NOW}",
+    "hidden" : true
+  }, {
+    "id" : "BT-05(b)-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Notice Dispatch Time",
+    "_label" : "field|name|BT-05(b)-notice",
+    "_presetValue" : "{NOW}",
+    "hidden" : true
+  }, {
+    "id" : "BT-738-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Notice Preferred Publication Date",
+    "_label" : "field|name|BT-738-notice",
+    "hidden" : true
+  }, {
+    "id" : "OPT-999",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Dummy Tender Award Date",
+    "_label" : "field|name|OPT-999",
+    "_presetValue" : "2000-01-01Z",
+    "hidden" : true
+  }, {
+    "id" : "OPT-001-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "UBL version ID (UBL)",
+    "_label" : "field|name|OPT-001-notice",
+    "hidden" : true
+  }, {
+    "id" : "OPT-002-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Customization ID (UBL)",
+    "_label" : "field|name|OPT-002-notice",
+    "readOnly" : true
+  }, {
+    "id" : "OPP-070-notice",
+    "contentType" : "field",
+    "displayType" : "COMBOBOX",
+    "description" : "Notice Subtype",
+    "_label" : "field|name|OPP-070-notice",
+    "readOnly" : true
+  }, {
+    "id" : "OPP-010-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "Notice Publication Number",
+    "_label" : "field|name|OPP-010-notice",
+    "hidden" : true
+  }, {
+    "id" : "OPP-011-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "OJEU Identifier",
+    "_label" : "field|name|OPP-011-notice",
+    "hidden" : true
+  }, {
+    "id" : "OPP-012-notice",
+    "contentType" : "field",
+    "displayType" : "TEXTBOX",
+    "description" : "OJEU Publication Date",
+    "_label" : "field|name|OPP-012-notice",
+    "hidden" : true
+  } ],
+  "content" : [ {
+
+    "id" : "GR-Result",
+    "contentType" : "group",
+    "nodeId" : "ND-NoticeResult",
+    "displayType" : "SECTION",
+    "description" : "Outcome of the Procurement Procedure for all lots listed in the notice (also contains individual Lot Results)",
+    "_label" : "group|name|ND-NoticeResult",
+    "content" : [ {
+
+      "id" : "GR-LotResult-Section",
+      "contentType" : "group",
+      "displayType" : "SECTION",
+      "description" : "Lot Results",
+      "_label" : "group|name|GR-LotResult-Section",
+      "content" : [ {
+        "id" : "GR-LotResult",
+        "contentType" : "group",
+        "nodeId" : "ND-LotResult",
+        "displayType" : "GROUP",
+        "description" : "Outcome of the Procurement Procedure for a given Lot",
+        "_label" : "group|name|ND-LotResult",
+        "_idScheme" : "RES",
+        "_schemeName" : "result",
+        "_identifierFieldId" : "OPT-322-LotResult",
+        "_repeatable" : true,
+        "content" : [ {
+
+          "id" : "GR-LotResult-CVD",
+          "contentType" : "group",
+          "nodeId" : "ND-StrategicProcurementInformationLotResult",
+          "displayType" : "GROUP",
+          "description" : "Information about the strategic procurement and associated assets: categories (Procurement, assets ...) and quantity (number) in the context of an applicable Legal Basis",
+          "_label" : "group|name|ND-StrategicProcurementInformationLotResult",
+          "_repeatable" : true,
+          "content" : [ {
+
+            "id" : "BT-735-LotResult",
+            "contentType" : "field",
+            "displayType" : "COMBOBOX",
+            "description" : "CVD Contract Type",
+            "_label" : "field|name|BT-735-LotResult"
+
+          } ]
+
+        } ]
+      } ]
+    } ]
+
+
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/notice-types.json b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/notice-types.json
index 8baa32b..966efaf 100644
--- a/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/notice-types.json
+++ b/src/test/resources/eforms-sdk-tests/tedefo-1845/valid/notice-types/notice-types.json
@@ -32,6 +32,15 @@
     "subTypeId" : "3",
     "_label" : "notice|name|3",
     "viewTemplateIds" : [ "3", "summary" ]
+  }, {
+    "documentType" : "CAN",
+    "legalBasis" : "32014L0024",
+    "formType" : "cont-modif",
+    "type" : "can-modif",
+    "description" : "Contract modification notice – general directive",
+    "subTypeId" : "38",
+    "_label" : "notice|name|38",
+    "viewTemplateIds" : [ "38", "summary" ]
   }],
   "documentTypes" : [ {
     "id" : "BRIN",

From 19e2f79fedc04ddb65815cacd56e762e77284183 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Wed, 18 Oct 2023 14:42:07 +0200
Subject: [PATCH 5/8] fields: Check schemeName with attribute preset value
 (TEDEFO-2673)

---
 .../eforms/sdk/analysis/fact/FieldFact.java   |   12 +
 .../analysis/drools/fieldsAndNodesRules.drl   |    9 +-
 .../tedefo-2673/invalid/fields/fields.json    | 1678 +++++++++++++++++
 .../tedefo-2673/valid/fields/fields.json      | 1678 +++++++++++++++++
 .../sdk/analysis/cucumber/tedefo-2673.feature |   25 +
 5 files changed, 3401 insertions(+), 1 deletion(-)
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2673/invalid/fields/fields.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2673/valid/fields/fields.json
 create mode 100644 src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2673.feature

diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
index 04ea711..e91a653 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
@@ -159,6 +159,18 @@ public List<String> getAttributes() {
     return field.getAttributes();
   }
 
+  public String getIdScheme() {
+    return field.getIdScheme();
+  }
+
+  public String getSchemeName() {
+    return field.getSchemeName();
+  }
+
+  public String getPresetValue() {
+    return field.getPresetValue();
+  }
+
   /**
    * Return a stream of the dynamic properties of the field
    */
diff --git a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
index 5c63d82..97f8dfb 100644
--- a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
+++ b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
@@ -188,10 +188,17 @@ then
   results.add(new ValidationResult($f, "Relationship with field " + $elementFieldId + " is incorrect", ValidationStatusEnum.ERROR));
 end
 
-// TEDEFO-1806: Warning
 rule "All fields of type code have a codelist property"
 when
   /fields[ $f: this, type == "code", codelistId == null ]
 then
   results.add(new ValidationResult($f, "The field is of type code but does not have a 'codelist' property", ValidationStatusEnum.ERROR));
 end
+
+rule "Fields with the schemeName property have a corresponding attribute field with the expected preset value"
+when
+  $attributeFieldId : /fields[ $f: this, $schemeName: schemeName, schemeName != null ]/attributes
+  not (exists /fields[ id == $attributeFieldId, attributeName == "schemeName", presetValue == $schemeName ])
+then
+  results.add(new ValidationResult($f, "SchemeName does not match preset value of a corresponding attribute field", ValidationStatusEnum.ERROR));
+end
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2673/invalid/fields/fields.json b/src/test/resources/eforms-sdk-tests/tedefo-2673/invalid/fields/fields.json
new file mode 100644
index 0000000..998886b
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-2673/invalid/fields/fields.json
@@ -0,0 +1,1678 @@
+{
+  "ublVersion" : "2.3",
+  "sdkVersion" : "eforms-sdk-1.8.0-SNAPSHOT",
+  "metadataDatabase" : {
+    "version" : "1.7.105",
+    "createdOn" : "2023-06-01T14:07:43"
+  },
+  "xmlStructure" : [ {
+    "id" : "ND-Root",
+    "xpathAbsolute" : "/*",
+    "xpathRelative" : "/*",
+    "repeatable" : false
+  }, {
+    "id" : "ND-AdditionalLanguage",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:AdditionalNoticeLanguage",
+    "xpathRelative" : "cac:AdditionalNoticeLanguage",
+    "xsdSequenceOrder" : [ { "cac:AdditionalNoticeLanguage" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractingParty",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ContractingParty",
+    "xpathRelative" : "cac:ContractingParty",
+    "xsdSequenceOrder" : [ { "cac:ContractingParty" : 29 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ServiceProvider",
+    "parentId" : "ND-ContractingParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ServiceProviderParty",
+    "parentId" : "ND-ServiceProvider",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty",
+    "xpathRelative" : "cac:ServiceProviderParty",
+    "xsdSequenceOrder" : [ { "cac:ServiceProviderParty" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProviderParty",
+    "parentId" : "ND-ServiceProviderParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureProcurementScope",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 41 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAdditionalCommodityClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureMainClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureContractAdditionalNature",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureTransportServiceType",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformance",
+    "parentId" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimate",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimateExtension",
+    "parentId" : "ND-ProcedureValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Lot",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLot" : 42 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "BT-137-Lot",
+    "captionFieldId" : "BT-21-Lot"
+  }, {
+    "id" : "ND-LotProcurementScope",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAdditionalClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OptionsAndRenewals",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension",
+    "xpathRelative" : "cac:ContractExtension",
+    "xsdSequenceOrder" : [ { "cac:ContractExtension" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OptionsDescription",
+    "parentId" : "ND-OptionsAndRenewals",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cac:Renewal/cac:Period",
+    "xpathRelative" : "cac:Renewal/cac:Period",
+    "xsdSequenceOrder" : [ { "cac:Renewal" : 7 }, { "cac:Period" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotMainClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDuration",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod",
+    "xpathRelative" : "cac:PlannedPeriod",
+    "xsdSequenceOrder" : [ { "cac:PlannedPeriod" : 19 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AccessibilityJustification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotContractAdditionalNature",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEnvironmentalImpactType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotGreenCriteria",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotInnovativeAcquisitionType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotSocialObjectiveType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPlacePerformance",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPerformanceAddress",
+    "parentId" : "ND-LotPlacePerformance",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimate",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimateExtension",
+    "parentId" : "ND-LotValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcess",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotInfoRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod",
+    "xpathRelative" : "cac:AdditionalInformationRequestPeriod",
+    "xsdSequenceOrder" : [ { "cac:AdditionalInformationRequestPeriod" : 21 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AuctionTerms",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms",
+    "xpathRelative" : "cac:AuctionTerms",
+    "xsdSequenceOrder" : [ { "cac:AuctionTerms" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecondStage",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 25 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FA",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement",
+    "xpathRelative" : "cac:FrameworkAgreement",
+    "xsdSequenceOrder" : [ { "cac:FrameworkAgreement" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FABuyerCategories",
+    "parentId" : "ND-FA",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xpathRelative" : "cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xsdSequenceOrder" : [ { "cac:SubsequentProcessTenderRequirement" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotPreviousPlanning",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PublicOpening",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent",
+    "xpathRelative" : "cac:OpenTenderEvent",
+    "xsdSequenceOrder" : [ { "cac:OpenTenderEvent" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PublicOpeningPlace",
+    "parentId" : "ND-PublicOpening",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cac:OccurenceLocation",
+    "xpathRelative" : "cac:OccurenceLocation",
+    "xsdSequenceOrder" : [ { "cac:OccurenceLocation" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ParticipationRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod",
+    "xpathRelative" : "cac:ParticipationRequestReceptionPeriod",
+    "xsdSequenceOrder" : [ { "cac:ParticipationRequestReceptionPeriod" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonEsubmission",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubmissionDeadline",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod",
+    "xpathRelative" : "cac:TenderSubmissionDeadlinePeriod",
+    "xsdSequenceOrder" : [ { "cac:TenderSubmissionDeadlinePeriod" : 17 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcessExtension",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PMCAnswersDeadline",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod",
+    "xpathRelative" : "efac:AnswerReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:AnswerReceptionPeriod" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-InterestExpressionReceptionPeriod",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod",
+    "xpathRelative" : "efac:InterestExpressionReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:InterestExpressionReceptionPeriod" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingTerms",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms",
+    "xpathRelative" : "cac:AllowedSubcontractTerms",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AllowedSubcontracting",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingObligation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReviewTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms",
+    "xpathRelative" : "cac:AppealTerms",
+    "xsdSequenceOrder" : [ { "cac:AppealTerms" : 48 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewPresentationPeriod",
+    "parentId" : "ND-LotReviewTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod",
+    "xpathRelative" : "cac:PresentationPeriod",
+    "xsdSequenceOrder" : [ { "cac:PresentationPeriod" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AwardingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms",
+    "xpathRelative" : "cac:AwardingTerms",
+    "xsdSequenceOrder" : [ { "cac:AwardingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteria",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion",
+    "xpathRelative" : "cac:AwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:AwardingCriterion" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterion",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion",
+    "xpathRelative" : "cac:SubordinateAwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:SubordinateAwardingCriterion" : 15 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionParameters",
+    "parentId" : "ND-LotAwardCriterion",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardFixedCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberFixUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionFixNumberUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardThresholdCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionThresholdNumberUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberThresholdUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardWeightCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionWeightNumberUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberWeightUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionDescriptionUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaNameUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionTypeUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberComplicatedUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaOrderJustificationUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Prize",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize",
+    "xpathRelative" : "cac:Prize",
+    "xsdSequenceOrder" : [ { "cac:Prize" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AwardingTermsJuryMember",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:TechnicalCommitteePerson",
+    "xpathRelative" : "cac:TechnicalCommitteePerson",
+    "xsdSequenceOrder" : [ { "cac:TechnicalCommitteePerson" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotProcurementDocument",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference",
+    "xpathRelative" : "cac:CallForTendersDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:CallForTendersDocumentReference" : 32 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExecutionRequirements",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-QualityTarget",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-NDA",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReservedExecution",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Participants",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 54 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreselectedParticipant",
+    "parentId" : "ND-Participants",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList/cac:PreSelectedParty",
+    "xpathRelative" : "cac:PreSelectedParty",
+    "xsdSequenceOrder" : [ { "cac:PreSelectedParty" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEmploymentLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference",
+    "xpathRelative" : "cac:EmploymentLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EmploymentLegislationDocumentReference" : 30 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotEnvironmentalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference",
+    "xpathRelative" : "cac:EnvironmentalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EnvironmentalLegislationDocumentReference" : 29 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotFiscalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference",
+    "xpathRelative" : "cac:FiscalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:FiscalLegislationDocumentReference" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotSubmissionLanguage",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:Language",
+    "xpathRelative" : "cac:Language",
+    "xsdSequenceOrder" : [ { "cac:Language" : 49 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PaymentTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PaymentTerms",
+    "xpathRelative" : "cac:PaymentTerms",
+    "xsdSequenceOrder" : [ { "cac:PaymentTerms" : 34 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PostAwarProcess",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess",
+    "xpathRelative" : "cac:PostAwardProcess",
+    "xsdSequenceOrder" : [ { "cac:PostAwardProcess" : 53 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FinancialGuarantee",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee",
+    "xpathRelative" : "cac:RequiredFinancialGuarantee",
+    "xsdSequenceOrder" : [ { "cac:RequiredFinancialGuarantee" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecurityClearanceTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm",
+    "xpathRelative" : "cac:SecurityClearanceTerm",
+    "xsdSequenceOrder" : [ { "cac:SecurityClearanceTerm" : 55 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TendererLegalForm",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedParticipation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedProcurement",
+    "parentId" : "ND-LotReservedParticipation",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xpathRelative" : "cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LateTendererInformation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 }, { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderRecipient",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty",
+    "xpathRelative" : "cac:TenderRecipientParty",
+    "xsdSequenceOrder" : [ { "cac:TenderRecipientParty" : 42 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonUBLTenderingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SenderContact",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:SenderParty/cac:Contact",
+    "xpathRelative" : "cac:SenderParty/cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:SenderParty" : 28 }, { "cac:Contact" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTenderingProcess",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 40 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreviousNoticeReference",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AcceleratedProcedure",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedJustificationUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAward",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationCodeUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationPreviousUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationTextUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureFeaturesUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTypeUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTerms",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDistribution",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution",
+    "xpathRelative" : "cac:LotDistribution",
+    "xsdSequenceOrder" : [ { "cac:LotDistribution" : 52 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupComposition",
+    "parentId" : "ND-LotDistribution",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup",
+    "xpathRelative" : "cac:LotsGroup",
+    "xsdSequenceOrder" : [ { "cac:LotsGroup" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupCompositionLotReference",
+    "parentId" : "ND-GroupComposition",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLotReference" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CrossBorderLaw",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CrossBorderLawUnpublish",
+    "parentId" : "ND-CrossBorderLaw",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LocalLegalBasisNoID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LocalLegalBasisWithID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TendererQualificationRequest",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest",
+    "xpathRelative" : "cac:TendererQualificationRequest",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ExclusionGrounds",
+    "parentId" : "ND-TendererQualificationRequest",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement",
+    "xpathRelative" : "cac:SpecificTendererRequirement",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OperationType",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/efac:NoticePurpose",
+    "xpathRelative" : "efac:NoticePurpose",
+    "xsdSequenceOrder" : [ { "efac:NoticePurpose" : 37 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RootExtension",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResult",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult",
+    "xpathRelative" : "efac:NoticeResult",
+    "xsdSequenceOrder" : [ { "efac:NoticeResult" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeApproximateValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResultGroupFA",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework",
+    "xpathRelative" : "efac:GroupFramework",
+    "xsdSequenceOrder" : [ { "efac:GroupFramework" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupMaximalValueIdentifierUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupReestimatedValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResult",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult",
+    "xpathRelative" : "efac:LotResult",
+    "xsdSequenceOrder" : [ { "efac:LotResult" : 6 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-322-LotResult",
+    "captionFieldId" : "BT-13713-LotResult"
+  }, {
+    "id" : "ND-FinancingParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:FinancingParty",
+    "xpathRelative" : "cac:FinancingParty",
+    "xsdSequenceOrder" : [ { "cac:FinancingParty" : 7 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PayerParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:PayerParty",
+    "xpathRelative" : "cac:PayerParty",
+    "xsdSequenceOrder" : [ { "cac:PayerParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatistics",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsCountUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsTypeUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-BuyerReviewComplainants",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevewRequestsUnpublish",
+    "parentId" : "ND-BuyerReviewComplainants",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NotAwardedReasonUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xpathRelative" : "efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xsdSequenceOrder" : [ { "efac:DecisionReason" : 10 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueHighestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueLowestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinnerChosenUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultFAValues",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues",
+    "xpathRelative" : "efac:FrameworkAgreementValues",
+    "xsdSequenceOrder" : [ { "efac:FrameworkAgreementValues" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-MaximalValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReestimatedValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultTenderReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissions",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics",
+    "xpathRelative" : "efac:ReceivedSubmissionsStatistics",
+    "xsdSequenceOrder" : [ { "efac:ReceivedSubmissionsStatistics" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissionCountUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReceivedSubmissionTypeUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultContractReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementLotResult",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement",
+    "xpathRelative" : "efac:StrategicProcurement",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurement" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-StrategicProcurementInformationLotResult",
+    "parentId" : "ND-StrategicProcurementLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation",
+    "xpathRelative" : "efac:StrategicProcurementInformation",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementInformation" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementDetailsLotResult",
+    "parentId" : "ND-StrategicProcurementInformationLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails",
+    "xpathRelative" : "efac:ProcurementDetails",
+    "xsdSequenceOrder" : [ { "efac:ProcurementDetails" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementStatistics",
+    "parentId" : "ND-ProcurementDetailsLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics",
+    "xpathRelative" : "efac:StrategicProcurementStatistics",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementStatistics" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotTender",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 7 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-321-Tender",
+    "captionFieldId" : "BT-3201-Tender"
+  }, {
+    "id" : "ND-TenderAggregatedAmounts",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts",
+    "xpathRelative" : "efac:AggregatedAmounts",
+    "xsdSequenceOrder" : [ { "efac:AggregatedAmounts" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenue",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue",
+    "xpathRelative" : "efac:ConcessionRevenue",
+    "xsdSequenceOrder" : [ { "efac:ConcessionRevenue" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueBuyerUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueUserUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ValueConcessionDescriptionUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RewardsPenalties",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevenueAllocation",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OtherContractExecutionConditions",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xpathRelative" : "efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderRankUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderValueUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderVariantUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderOriginCountry",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin",
+    "xpathRelative" : "efac:Origin",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CountryOriginUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xpathRelative" : "efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedActivity",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm",
+    "xpathRelative" : "efac:SubcontractingTerm",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedContract",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xpathRelative" : "efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingDescriptionUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SettledContract",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-316-Contract",
+    "captionFieldId" : "BT-150-Contract"
+  }, {
+    "id" : "ND-ContractSignatory",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/cac:SignatoryParty",
+    "xpathRelative" : "cac:SignatoryParty",
+    "xsdSequenceOrder" : [ { "cac:SignatoryParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExtendedDurationJustification",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification",
+    "xpathRelative" : "efac:DurationJustification",
+    "xsdSequenceOrder" : [ { "efac:DurationJustification" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AssetList",
+    "parentId" : "ND-ExtendedDurationJustification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList",
+    "xpathRelative" : "efac:AssetsList",
+    "xsdSequenceOrder" : [ { "efac:AssetsList" : 2 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Asset",
+    "parentId" : "ND-AssetList",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset",
+    "xpathRelative" : "efac:Asset",
+    "xsdSequenceOrder" : [ { "efac:Asset" : 1 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractEUFunds",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding",
+    "xpathRelative" : "efac:Funding",
+    "xsdSequenceOrder" : [ { "efac:Funding" : 12 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SettledContractTenderReference",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderingParty",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty",
+    "xpathRelative" : "efac:TenderingParty",
+    "xsdSequenceOrder" : [ { "efac:TenderingParty" : 9 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-210-Tenderer"
+  }, {
+    "id" : "ND-SubContractor",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor",
+    "xpathRelative" : "efac:SubContractor",
+    "xsdSequenceOrder" : [ { "efac:SubContractor" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SubContractorTakerReference",
+    "parentId" : "ND-SubContractor",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor/efac:MainContractor",
+    "xpathRelative" : "efac:MainContractor",
+    "xsdSequenceOrder" : [ { "efac:MainContractor" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Tenderer",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:Tenderer",
+    "xpathRelative" : "efac:Tenderer",
+    "xsdSequenceOrder" : [ { "efac:Tenderer" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Organizations",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations",
+    "xpathRelative" : "efac:Organizations",
+    "xsdSequenceOrder" : [ { "efac:Organizations" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Organization",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization",
+    "xpathRelative" : "efac:Organization",
+    "xsdSequenceOrder" : [ { "efac:Organization" : 1 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-200-Organization-Company",
+    "captionFieldId" : "BT-500-Organization-Company"
+  }, {
+    "id" : "ND-Company",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company",
+    "xpathRelative" : "efac:Company",
+    "xsdSequenceOrder" : [ { "efac:Company" : 7 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyContact",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyLegalEntity",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity",
+    "xpathRelative" : "cac:PartyLegalEntity",
+    "xsdSequenceOrder" : [ { "cac:PartyLegalEntity" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CompanyAddress",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Touchpoint",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint",
+    "xpathRelative" : "efac:TouchPoint",
+    "xsdSequenceOrder" : [ { "efac:TouchPoint" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-201-Organization-TouchPoint",
+    "captionFieldId" : "BT-500-Organization-TouchPoint"
+  }, {
+    "id" : "ND-TouchpointContact",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TouchpointAddress",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OrganizationUboReference",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-UBO",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 2 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-202-UBO",
+    "captionFieldId" : "BT-500-UBO"
+  }, {
+    "id" : "ND-UBOContact",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 4 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBOAddress",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress",
+    "xpathRelative" : "cac:ResidenceAddress",
+    "xsdSequenceOrder" : [ { "cac:ResidenceAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBONationality",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/efac:Nationality",
+    "xpathRelative" : "efac:Nationality",
+    "xsdSequenceOrder" : [ { "efac:Nationality" : 6 } ],
+    "repeatable" : true
+  } ],
+  "fields" : [ {
+    "id" : "BT-02-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Type",
+    "btId" : "BT-02",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode",
+    "xpathRelative" : "cbc:NoticeTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributes" : [ "BT-03-notice" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "notice-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-03-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Form Type",
+    "btId" : "BT-03",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode/@listName",
+    "xpathRelative" : "cbc:NoticeTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-02-notice",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "form-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "code",
+    "attributes" : [ "BT-06-Lot-List" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "strategic-procurement",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot-List",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement Listname",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-06-Lot",
+    "presetValue" : "strategic-procurement",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-109-Lot",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification",
+    "xpathRelative" : "cbc:Justification",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "text-multilingual",
+    "attributes" : [ "BT-109-Lot-Language" ],
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-109-Lot-Language",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification Language",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification/@languageID",
+    "xpathRelative" : "cbc:Justification/@languageID",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-109-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "BT-137-Lot-Scheme" ],
+    "idScheme" : "LOT",
+    "schemeName" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^LOT-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot-Scheme",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier Schemename",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/@schemeName",
+    "xpathRelative" : "cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-137-Lot",
+    "presetValue" : "LotBAD",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "OPT-200-Organization-Company-Scheme" ],
+    "idScheme" : "ORG",
+    "schemeName" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^ORG-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company-Scheme",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier Schemename",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "BADschemeName",
+    "attributeOf" : "OPT-200-Organization-Company",
+    "presetValue" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2673/valid/fields/fields.json b/src/test/resources/eforms-sdk-tests/tedefo-2673/valid/fields/fields.json
new file mode 100644
index 0000000..d6ebe84
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-2673/valid/fields/fields.json
@@ -0,0 +1,1678 @@
+{
+  "ublVersion" : "2.3",
+  "sdkVersion" : "eforms-sdk-1.8.0-SNAPSHOT",
+  "metadataDatabase" : {
+    "version" : "1.7.105",
+    "createdOn" : "2023-06-01T14:07:43"
+  },
+  "xmlStructure" : [ {
+    "id" : "ND-Root",
+    "xpathAbsolute" : "/*",
+    "xpathRelative" : "/*",
+    "repeatable" : false
+  }, {
+    "id" : "ND-AdditionalLanguage",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:AdditionalNoticeLanguage",
+    "xpathRelative" : "cac:AdditionalNoticeLanguage",
+    "xsdSequenceOrder" : [ { "cac:AdditionalNoticeLanguage" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractingParty",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ContractingParty",
+    "xpathRelative" : "cac:ContractingParty",
+    "xsdSequenceOrder" : [ { "cac:ContractingParty" : 29 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ServiceProvider",
+    "parentId" : "ND-ContractingParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ServiceProviderParty",
+    "parentId" : "ND-ServiceProvider",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty",
+    "xpathRelative" : "cac:ServiceProviderParty",
+    "xsdSequenceOrder" : [ { "cac:ServiceProviderParty" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProviderParty",
+    "parentId" : "ND-ServiceProviderParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureProcurementScope",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 41 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAdditionalCommodityClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureMainClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureContractAdditionalNature",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureTransportServiceType",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformance",
+    "parentId" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimate",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimateExtension",
+    "parentId" : "ND-ProcedureValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Lot",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLot" : 42 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "BT-137-Lot",
+    "captionFieldId" : "BT-21-Lot"
+  }, {
+    "id" : "ND-LotProcurementScope",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAdditionalClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OptionsAndRenewals",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension",
+    "xpathRelative" : "cac:ContractExtension",
+    "xsdSequenceOrder" : [ { "cac:ContractExtension" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OptionsDescription",
+    "parentId" : "ND-OptionsAndRenewals",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cac:Renewal/cac:Period",
+    "xpathRelative" : "cac:Renewal/cac:Period",
+    "xsdSequenceOrder" : [ { "cac:Renewal" : 7 }, { "cac:Period" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotMainClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDuration",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod",
+    "xpathRelative" : "cac:PlannedPeriod",
+    "xsdSequenceOrder" : [ { "cac:PlannedPeriod" : 19 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AccessibilityJustification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotContractAdditionalNature",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEnvironmentalImpactType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotGreenCriteria",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotInnovativeAcquisitionType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotSocialObjectiveType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPlacePerformance",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPerformanceAddress",
+    "parentId" : "ND-LotPlacePerformance",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimate",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimateExtension",
+    "parentId" : "ND-LotValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcess",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotInfoRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod",
+    "xpathRelative" : "cac:AdditionalInformationRequestPeriod",
+    "xsdSequenceOrder" : [ { "cac:AdditionalInformationRequestPeriod" : 21 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AuctionTerms",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms",
+    "xpathRelative" : "cac:AuctionTerms",
+    "xsdSequenceOrder" : [ { "cac:AuctionTerms" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecondStage",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 25 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FA",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement",
+    "xpathRelative" : "cac:FrameworkAgreement",
+    "xsdSequenceOrder" : [ { "cac:FrameworkAgreement" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FABuyerCategories",
+    "parentId" : "ND-FA",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xpathRelative" : "cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xsdSequenceOrder" : [ { "cac:SubsequentProcessTenderRequirement" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotPreviousPlanning",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PublicOpening",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent",
+    "xpathRelative" : "cac:OpenTenderEvent",
+    "xsdSequenceOrder" : [ { "cac:OpenTenderEvent" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PublicOpeningPlace",
+    "parentId" : "ND-PublicOpening",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cac:OccurenceLocation",
+    "xpathRelative" : "cac:OccurenceLocation",
+    "xsdSequenceOrder" : [ { "cac:OccurenceLocation" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ParticipationRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod",
+    "xpathRelative" : "cac:ParticipationRequestReceptionPeriod",
+    "xsdSequenceOrder" : [ { "cac:ParticipationRequestReceptionPeriod" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonEsubmission",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubmissionDeadline",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod",
+    "xpathRelative" : "cac:TenderSubmissionDeadlinePeriod",
+    "xsdSequenceOrder" : [ { "cac:TenderSubmissionDeadlinePeriod" : 17 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcessExtension",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PMCAnswersDeadline",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod",
+    "xpathRelative" : "efac:AnswerReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:AnswerReceptionPeriod" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-InterestExpressionReceptionPeriod",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod",
+    "xpathRelative" : "efac:InterestExpressionReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:InterestExpressionReceptionPeriod" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingTerms",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms",
+    "xpathRelative" : "cac:AllowedSubcontractTerms",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AllowedSubcontracting",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingObligation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReviewTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms",
+    "xpathRelative" : "cac:AppealTerms",
+    "xsdSequenceOrder" : [ { "cac:AppealTerms" : 48 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewPresentationPeriod",
+    "parentId" : "ND-LotReviewTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod",
+    "xpathRelative" : "cac:PresentationPeriod",
+    "xsdSequenceOrder" : [ { "cac:PresentationPeriod" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AwardingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms",
+    "xpathRelative" : "cac:AwardingTerms",
+    "xsdSequenceOrder" : [ { "cac:AwardingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteria",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion",
+    "xpathRelative" : "cac:AwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:AwardingCriterion" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterion",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion",
+    "xpathRelative" : "cac:SubordinateAwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:SubordinateAwardingCriterion" : 15 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionParameters",
+    "parentId" : "ND-LotAwardCriterion",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardFixedCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberFixUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionFixNumberUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardThresholdCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionThresholdNumberUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberThresholdUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardWeightCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionWeightNumberUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberWeightUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionDescriptionUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaNameUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionTypeUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberComplicatedUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaOrderJustificationUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Prize",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize",
+    "xpathRelative" : "cac:Prize",
+    "xsdSequenceOrder" : [ { "cac:Prize" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AwardingTermsJuryMember",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:TechnicalCommitteePerson",
+    "xpathRelative" : "cac:TechnicalCommitteePerson",
+    "xsdSequenceOrder" : [ { "cac:TechnicalCommitteePerson" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotProcurementDocument",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference",
+    "xpathRelative" : "cac:CallForTendersDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:CallForTendersDocumentReference" : 32 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExecutionRequirements",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-QualityTarget",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-NDA",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReservedExecution",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Participants",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 54 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreselectedParticipant",
+    "parentId" : "ND-Participants",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList/cac:PreSelectedParty",
+    "xpathRelative" : "cac:PreSelectedParty",
+    "xsdSequenceOrder" : [ { "cac:PreSelectedParty" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEmploymentLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference",
+    "xpathRelative" : "cac:EmploymentLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EmploymentLegislationDocumentReference" : 30 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotEnvironmentalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference",
+    "xpathRelative" : "cac:EnvironmentalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EnvironmentalLegislationDocumentReference" : 29 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotFiscalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference",
+    "xpathRelative" : "cac:FiscalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:FiscalLegislationDocumentReference" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotSubmissionLanguage",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:Language",
+    "xpathRelative" : "cac:Language",
+    "xsdSequenceOrder" : [ { "cac:Language" : 49 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PaymentTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PaymentTerms",
+    "xpathRelative" : "cac:PaymentTerms",
+    "xsdSequenceOrder" : [ { "cac:PaymentTerms" : 34 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PostAwarProcess",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess",
+    "xpathRelative" : "cac:PostAwardProcess",
+    "xsdSequenceOrder" : [ { "cac:PostAwardProcess" : 53 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FinancialGuarantee",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee",
+    "xpathRelative" : "cac:RequiredFinancialGuarantee",
+    "xsdSequenceOrder" : [ { "cac:RequiredFinancialGuarantee" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecurityClearanceTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm",
+    "xpathRelative" : "cac:SecurityClearanceTerm",
+    "xsdSequenceOrder" : [ { "cac:SecurityClearanceTerm" : 55 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TendererLegalForm",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedParticipation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedProcurement",
+    "parentId" : "ND-LotReservedParticipation",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xpathRelative" : "cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LateTendererInformation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 }, { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderRecipient",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty",
+    "xpathRelative" : "cac:TenderRecipientParty",
+    "xsdSequenceOrder" : [ { "cac:TenderRecipientParty" : 42 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonUBLTenderingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SenderContact",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:SenderParty/cac:Contact",
+    "xpathRelative" : "cac:SenderParty/cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:SenderParty" : 28 }, { "cac:Contact" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTenderingProcess",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 40 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreviousNoticeReference",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AcceleratedProcedure",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedJustificationUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAward",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationCodeUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationPreviousUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationTextUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureFeaturesUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTypeUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTerms",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDistribution",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution",
+    "xpathRelative" : "cac:LotDistribution",
+    "xsdSequenceOrder" : [ { "cac:LotDistribution" : 52 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupComposition",
+    "parentId" : "ND-LotDistribution",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup",
+    "xpathRelative" : "cac:LotsGroup",
+    "xsdSequenceOrder" : [ { "cac:LotsGroup" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupCompositionLotReference",
+    "parentId" : "ND-GroupComposition",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLotReference" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CrossBorderLaw",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CrossBorderLawUnpublish",
+    "parentId" : "ND-CrossBorderLaw",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LocalLegalBasisNoID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LocalLegalBasisWithID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TendererQualificationRequest",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest",
+    "xpathRelative" : "cac:TendererQualificationRequest",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ExclusionGrounds",
+    "parentId" : "ND-TendererQualificationRequest",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement",
+    "xpathRelative" : "cac:SpecificTendererRequirement",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OperationType",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/efac:NoticePurpose",
+    "xpathRelative" : "efac:NoticePurpose",
+    "xsdSequenceOrder" : [ { "efac:NoticePurpose" : 37 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RootExtension",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResult",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult",
+    "xpathRelative" : "efac:NoticeResult",
+    "xsdSequenceOrder" : [ { "efac:NoticeResult" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeApproximateValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResultGroupFA",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework",
+    "xpathRelative" : "efac:GroupFramework",
+    "xsdSequenceOrder" : [ { "efac:GroupFramework" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupMaximalValueIdentifierUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupReestimatedValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResult",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult",
+    "xpathRelative" : "efac:LotResult",
+    "xsdSequenceOrder" : [ { "efac:LotResult" : 6 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-322-LotResult",
+    "captionFieldId" : "BT-13713-LotResult"
+  }, {
+    "id" : "ND-FinancingParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:FinancingParty",
+    "xpathRelative" : "cac:FinancingParty",
+    "xsdSequenceOrder" : [ { "cac:FinancingParty" : 7 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PayerParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:PayerParty",
+    "xpathRelative" : "cac:PayerParty",
+    "xsdSequenceOrder" : [ { "cac:PayerParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatistics",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsCountUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsTypeUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-BuyerReviewComplainants",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevewRequestsUnpublish",
+    "parentId" : "ND-BuyerReviewComplainants",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NotAwardedReasonUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xpathRelative" : "efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xsdSequenceOrder" : [ { "efac:DecisionReason" : 10 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueHighestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueLowestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinnerChosenUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultFAValues",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues",
+    "xpathRelative" : "efac:FrameworkAgreementValues",
+    "xsdSequenceOrder" : [ { "efac:FrameworkAgreementValues" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-MaximalValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReestimatedValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultTenderReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissions",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics",
+    "xpathRelative" : "efac:ReceivedSubmissionsStatistics",
+    "xsdSequenceOrder" : [ { "efac:ReceivedSubmissionsStatistics" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissionCountUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReceivedSubmissionTypeUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultContractReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementLotResult",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement",
+    "xpathRelative" : "efac:StrategicProcurement",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurement" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-StrategicProcurementInformationLotResult",
+    "parentId" : "ND-StrategicProcurementLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation",
+    "xpathRelative" : "efac:StrategicProcurementInformation",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementInformation" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementDetailsLotResult",
+    "parentId" : "ND-StrategicProcurementInformationLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails",
+    "xpathRelative" : "efac:ProcurementDetails",
+    "xsdSequenceOrder" : [ { "efac:ProcurementDetails" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementStatistics",
+    "parentId" : "ND-ProcurementDetailsLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics",
+    "xpathRelative" : "efac:StrategicProcurementStatistics",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementStatistics" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotTender",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 7 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-321-Tender",
+    "captionFieldId" : "BT-3201-Tender"
+  }, {
+    "id" : "ND-TenderAggregatedAmounts",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts",
+    "xpathRelative" : "efac:AggregatedAmounts",
+    "xsdSequenceOrder" : [ { "efac:AggregatedAmounts" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenue",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue",
+    "xpathRelative" : "efac:ConcessionRevenue",
+    "xsdSequenceOrder" : [ { "efac:ConcessionRevenue" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueBuyerUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueUserUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ValueConcessionDescriptionUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RewardsPenalties",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevenueAllocation",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OtherContractExecutionConditions",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xpathRelative" : "efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderRankUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderValueUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderVariantUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderOriginCountry",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin",
+    "xpathRelative" : "efac:Origin",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CountryOriginUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xpathRelative" : "efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedActivity",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm",
+    "xpathRelative" : "efac:SubcontractingTerm",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedContract",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xpathRelative" : "efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingDescriptionUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SettledContract",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-316-Contract",
+    "captionFieldId" : "BT-150-Contract"
+  }, {
+    "id" : "ND-ContractSignatory",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/cac:SignatoryParty",
+    "xpathRelative" : "cac:SignatoryParty",
+    "xsdSequenceOrder" : [ { "cac:SignatoryParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExtendedDurationJustification",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification",
+    "xpathRelative" : "efac:DurationJustification",
+    "xsdSequenceOrder" : [ { "efac:DurationJustification" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AssetList",
+    "parentId" : "ND-ExtendedDurationJustification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList",
+    "xpathRelative" : "efac:AssetsList",
+    "xsdSequenceOrder" : [ { "efac:AssetsList" : 2 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Asset",
+    "parentId" : "ND-AssetList",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset",
+    "xpathRelative" : "efac:Asset",
+    "xsdSequenceOrder" : [ { "efac:Asset" : 1 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractEUFunds",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding",
+    "xpathRelative" : "efac:Funding",
+    "xsdSequenceOrder" : [ { "efac:Funding" : 12 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SettledContractTenderReference",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderingParty",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty",
+    "xpathRelative" : "efac:TenderingParty",
+    "xsdSequenceOrder" : [ { "efac:TenderingParty" : 9 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-210-Tenderer"
+  }, {
+    "id" : "ND-SubContractor",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor",
+    "xpathRelative" : "efac:SubContractor",
+    "xsdSequenceOrder" : [ { "efac:SubContractor" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SubContractorTakerReference",
+    "parentId" : "ND-SubContractor",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor/efac:MainContractor",
+    "xpathRelative" : "efac:MainContractor",
+    "xsdSequenceOrder" : [ { "efac:MainContractor" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Tenderer",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:Tenderer",
+    "xpathRelative" : "efac:Tenderer",
+    "xsdSequenceOrder" : [ { "efac:Tenderer" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Organizations",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations",
+    "xpathRelative" : "efac:Organizations",
+    "xsdSequenceOrder" : [ { "efac:Organizations" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Organization",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization",
+    "xpathRelative" : "efac:Organization",
+    "xsdSequenceOrder" : [ { "efac:Organization" : 1 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-200-Organization-Company",
+    "captionFieldId" : "BT-500-Organization-Company"
+  }, {
+    "id" : "ND-Company",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company",
+    "xpathRelative" : "efac:Company",
+    "xsdSequenceOrder" : [ { "efac:Company" : 7 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyContact",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyLegalEntity",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity",
+    "xpathRelative" : "cac:PartyLegalEntity",
+    "xsdSequenceOrder" : [ { "cac:PartyLegalEntity" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CompanyAddress",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Touchpoint",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint",
+    "xpathRelative" : "efac:TouchPoint",
+    "xsdSequenceOrder" : [ { "efac:TouchPoint" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-201-Organization-TouchPoint",
+    "captionFieldId" : "BT-500-Organization-TouchPoint"
+  }, {
+    "id" : "ND-TouchpointContact",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TouchpointAddress",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OrganizationUboReference",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-UBO",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 2 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-202-UBO",
+    "captionFieldId" : "BT-500-UBO"
+  }, {
+    "id" : "ND-UBOContact",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 4 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBOAddress",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress",
+    "xpathRelative" : "cac:ResidenceAddress",
+    "xsdSequenceOrder" : [ { "cac:ResidenceAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBONationality",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/efac:Nationality",
+    "xpathRelative" : "efac:Nationality",
+    "xsdSequenceOrder" : [ { "efac:Nationality" : 6 } ],
+    "repeatable" : true
+  } ],
+  "fields" : [ {
+    "id" : "BT-02-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Type",
+    "btId" : "BT-02",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode",
+    "xpathRelative" : "cbc:NoticeTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributes" : [ "BT-03-notice" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "notice-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-03-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Form Type",
+    "btId" : "BT-03",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode/@listName",
+    "xpathRelative" : "cbc:NoticeTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-02-notice",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "form-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "code",
+    "attributes" : [ "BT-06-Lot-List" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "strategic-procurement",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot-List",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement Listname",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-06-Lot",
+    "presetValue" : "strategic-procurement",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-109-Lot",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification",
+    "xpathRelative" : "cbc:Justification",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "text-multilingual",
+    "attributes" : [ "BT-109-Lot-Language" ],
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-109-Lot-Language",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification Language",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification/@languageID",
+    "xpathRelative" : "cbc:Justification/@languageID",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-109-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "BT-137-Lot-Scheme" ],
+    "idScheme" : "LOT",
+    "schemeName" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^LOT-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot-Scheme",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier Schemename",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/@schemeName",
+    "xpathRelative" : "cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-137-Lot",
+    "presetValue" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "OPT-200-Organization-Company-Scheme" ],
+    "idScheme" : "ORG",
+    "schemeName" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^ORG-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company-Scheme",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier Schemename",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-200-Organization-Company",
+    "presetValue" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2673.feature b/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2673.feature
new file mode 100644
index 0000000..673b3b4
--- /dev/null
+++ b/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2673.feature
@@ -0,0 +1,25 @@
+@tedefo-2673
+Feature: Fields - Field validation
+  TEDEFO-2673: Value in schemeName is consistent with preset value in corresponding attribute field
+  Test files under "src/test/resources/eforms-sdk-tests/tedefo-2673"
+
+  Background:
+    Given The following rules
+      | Fields with the schemeName property have a corresponding attribute field with the expected preset value |
+
+  Scenario: All fields have consistent information on XML attributes
+    Given A "tedefo-2673" folder with "valid" files
+    When I load all fields
+    And I execute validation
+    Then I should get 0 SDK validation errors
+
+  Scenario Outline: Some fields have incorrect information on XML attributes
+    Given A "tedefo-2673" folder with "invalid" files
+    When I load all fields
+    And I execute validation
+    Then Rule "<expected rule>" should have been fired
+    And I should get 2 SDK validation errors
+
+    Examples:
+      | expected rule                     |
+      | Fields with the schemeName property have a corresponding attribute field with the expected preset value |

From b44751c623cb102e0401c361b9ed5d85928a6095 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Tue, 7 Nov 2023 14:09:13 +0100
Subject: [PATCH 6/8] fields: Check noticeTypes properties have no duplicates
 (TEDEFO-2740)

---
 .../domain/field/AbstractFieldProperty.java   |   13 +
 .../eforms/sdk/analysis/fact/FieldFact.java   |   17 +
 .../analysis/drools/fieldsAndNodesRules.drl   |    7 +
 .../tedefo-2740/invalid/fields/fields.json    | 1678 +++++++++++++++++
 .../tedefo-2740/valid/fields/fields.json      | 1678 +++++++++++++++++
 .../sdk/analysis/cucumber/tedefo-2740.feature |   25 +
 6 files changed, 3418 insertions(+)
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2740/invalid/fields/fields.json
 create mode 100644 src/test/resources/eforms-sdk-tests/tedefo-2740/valid/fields/fields.json
 create mode 100644 src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2740.feature

diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/field/AbstractFieldProperty.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/field/AbstractFieldProperty.java
index face592..f6d78da 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/field/AbstractFieldProperty.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/domain/field/AbstractFieldProperty.java
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -64,6 +65,18 @@ public Set<String> getAllNoticeTypeIds() {
         .collect(Collectors.toSet());
   }
 
+  public Set<String> getDuplicateNoticeTypeIds() {
+    List<String> values = getConstraints()
+        .stream()
+        .map(AbstractConstraint::getNoticeTypes)
+        .flatMap(List::stream)
+        .collect(Collectors.toList());
+    
+    return values.stream()
+        .filter(i -> Collections.frequency(values, i) > 1)
+        .collect(Collectors.toSet());
+  }
+
   /**
    * @return All label identifiers referenced in the constraints of this field property.
    */
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
index e91a653..5b5ec0d 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
@@ -197,6 +197,23 @@ public Set<String> getAllNoticeTypes() {
     return noticeTypes;
   }
 
+  /**
+   * Return the notices types that appear more than once in the same property.
+   */
+  public Set<String> getDuplicateNoticeTypes() {
+    Set<String> noticeTypes = new HashSet<>();
+    
+    // Go over all dynamic properties and collect duplicate notice types
+    getDynamicProperties()
+        .forEach(property -> {
+          if (property != null) {
+            noticeTypes.addAll(property.getDuplicateNoticeTypeIds());
+          }
+        });
+    
+    return noticeTypes;
+  }
+
   public String getPrivacyCode() {
     if (field.getPrivacy() != null) {
       return field.getPrivacy().getCode().getLiteral();
diff --git a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
index 97f8dfb..ff2dc00 100644
--- a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
+++ b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
@@ -202,3 +202,10 @@ when
 then
   results.add(new ValidationResult($f, "SchemeName does not match preset value of a corresponding attribute field", ValidationStatusEnum.ERROR));
 end
+
+rule "Field constraints do not have duplicate notice types identifiers"
+when
+  /fields[ $f: this, $duplicateNoticeTypes: duplicateNoticeTypes, $duplicateNoticeTypes.size() > 0 ]
+then
+  results.add(new ValidationResult($f, "At least one constraint has duplicate notice types :" + $duplicateNoticeTypes, ValidationStatusEnum.ERROR));
+end
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2740/invalid/fields/fields.json b/src/test/resources/eforms-sdk-tests/tedefo-2740/invalid/fields/fields.json
new file mode 100644
index 0000000..8443512
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-2740/invalid/fields/fields.json
@@ -0,0 +1,1678 @@
+{
+  "ublVersion" : "2.3",
+  "sdkVersion" : "eforms-sdk-1.8.0-SNAPSHOT",
+  "metadataDatabase" : {
+    "version" : "1.7.105",
+    "createdOn" : "2023-06-01T14:07:43"
+  },
+  "xmlStructure" : [ {
+    "id" : "ND-Root",
+    "xpathAbsolute" : "/*",
+    "xpathRelative" : "/*",
+    "repeatable" : false
+  }, {
+    "id" : "ND-AdditionalLanguage",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:AdditionalNoticeLanguage",
+    "xpathRelative" : "cac:AdditionalNoticeLanguage",
+    "xsdSequenceOrder" : [ { "cac:AdditionalNoticeLanguage" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractingParty",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ContractingParty",
+    "xpathRelative" : "cac:ContractingParty",
+    "xsdSequenceOrder" : [ { "cac:ContractingParty" : 29 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ServiceProvider",
+    "parentId" : "ND-ContractingParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ServiceProviderParty",
+    "parentId" : "ND-ServiceProvider",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty",
+    "xpathRelative" : "cac:ServiceProviderParty",
+    "xsdSequenceOrder" : [ { "cac:ServiceProviderParty" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProviderParty",
+    "parentId" : "ND-ServiceProviderParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureProcurementScope",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 41 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAdditionalCommodityClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureMainClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureContractAdditionalNature",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureTransportServiceType",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformance",
+    "parentId" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimate",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimateExtension",
+    "parentId" : "ND-ProcedureValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Lot",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLot" : 42 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "BT-137-Lot",
+    "captionFieldId" : "BT-21-Lot"
+  }, {
+    "id" : "ND-LotProcurementScope",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAdditionalClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OptionsAndRenewals",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension",
+    "xpathRelative" : "cac:ContractExtension",
+    "xsdSequenceOrder" : [ { "cac:ContractExtension" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OptionsDescription",
+    "parentId" : "ND-OptionsAndRenewals",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cac:Renewal/cac:Period",
+    "xpathRelative" : "cac:Renewal/cac:Period",
+    "xsdSequenceOrder" : [ { "cac:Renewal" : 7 }, { "cac:Period" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotMainClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDuration",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod",
+    "xpathRelative" : "cac:PlannedPeriod",
+    "xsdSequenceOrder" : [ { "cac:PlannedPeriod" : 19 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AccessibilityJustification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotContractAdditionalNature",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEnvironmentalImpactType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotGreenCriteria",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotInnovativeAcquisitionType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotSocialObjectiveType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPlacePerformance",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPerformanceAddress",
+    "parentId" : "ND-LotPlacePerformance",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimate",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimateExtension",
+    "parentId" : "ND-LotValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcess",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotInfoRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod",
+    "xpathRelative" : "cac:AdditionalInformationRequestPeriod",
+    "xsdSequenceOrder" : [ { "cac:AdditionalInformationRequestPeriod" : 21 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AuctionTerms",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms",
+    "xpathRelative" : "cac:AuctionTerms",
+    "xsdSequenceOrder" : [ { "cac:AuctionTerms" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecondStage",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 25 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FA",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement",
+    "xpathRelative" : "cac:FrameworkAgreement",
+    "xsdSequenceOrder" : [ { "cac:FrameworkAgreement" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FABuyerCategories",
+    "parentId" : "ND-FA",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xpathRelative" : "cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xsdSequenceOrder" : [ { "cac:SubsequentProcessTenderRequirement" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotPreviousPlanning",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PublicOpening",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent",
+    "xpathRelative" : "cac:OpenTenderEvent",
+    "xsdSequenceOrder" : [ { "cac:OpenTenderEvent" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PublicOpeningPlace",
+    "parentId" : "ND-PublicOpening",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cac:OccurenceLocation",
+    "xpathRelative" : "cac:OccurenceLocation",
+    "xsdSequenceOrder" : [ { "cac:OccurenceLocation" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ParticipationRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod",
+    "xpathRelative" : "cac:ParticipationRequestReceptionPeriod",
+    "xsdSequenceOrder" : [ { "cac:ParticipationRequestReceptionPeriod" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonEsubmission",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubmissionDeadline",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod",
+    "xpathRelative" : "cac:TenderSubmissionDeadlinePeriod",
+    "xsdSequenceOrder" : [ { "cac:TenderSubmissionDeadlinePeriod" : 17 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcessExtension",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PMCAnswersDeadline",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod",
+    "xpathRelative" : "efac:AnswerReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:AnswerReceptionPeriod" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-InterestExpressionReceptionPeriod",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod",
+    "xpathRelative" : "efac:InterestExpressionReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:InterestExpressionReceptionPeriod" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingTerms",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms",
+    "xpathRelative" : "cac:AllowedSubcontractTerms",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AllowedSubcontracting",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingObligation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReviewTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms",
+    "xpathRelative" : "cac:AppealTerms",
+    "xsdSequenceOrder" : [ { "cac:AppealTerms" : 48 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewPresentationPeriod",
+    "parentId" : "ND-LotReviewTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod",
+    "xpathRelative" : "cac:PresentationPeriod",
+    "xsdSequenceOrder" : [ { "cac:PresentationPeriod" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AwardingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms",
+    "xpathRelative" : "cac:AwardingTerms",
+    "xsdSequenceOrder" : [ { "cac:AwardingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteria",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion",
+    "xpathRelative" : "cac:AwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:AwardingCriterion" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterion",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion",
+    "xpathRelative" : "cac:SubordinateAwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:SubordinateAwardingCriterion" : 15 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionParameters",
+    "parentId" : "ND-LotAwardCriterion",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardFixedCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberFixUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionFixNumberUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardThresholdCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionThresholdNumberUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberThresholdUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardWeightCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionWeightNumberUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberWeightUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionDescriptionUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaNameUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionTypeUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberComplicatedUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaOrderJustificationUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Prize",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize",
+    "xpathRelative" : "cac:Prize",
+    "xsdSequenceOrder" : [ { "cac:Prize" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AwardingTermsJuryMember",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:TechnicalCommitteePerson",
+    "xpathRelative" : "cac:TechnicalCommitteePerson",
+    "xsdSequenceOrder" : [ { "cac:TechnicalCommitteePerson" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotProcurementDocument",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference",
+    "xpathRelative" : "cac:CallForTendersDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:CallForTendersDocumentReference" : 32 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExecutionRequirements",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-QualityTarget",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-NDA",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReservedExecution",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Participants",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 54 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreselectedParticipant",
+    "parentId" : "ND-Participants",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList/cac:PreSelectedParty",
+    "xpathRelative" : "cac:PreSelectedParty",
+    "xsdSequenceOrder" : [ { "cac:PreSelectedParty" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEmploymentLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference",
+    "xpathRelative" : "cac:EmploymentLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EmploymentLegislationDocumentReference" : 30 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotEnvironmentalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference",
+    "xpathRelative" : "cac:EnvironmentalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EnvironmentalLegislationDocumentReference" : 29 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotFiscalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference",
+    "xpathRelative" : "cac:FiscalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:FiscalLegislationDocumentReference" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotSubmissionLanguage",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:Language",
+    "xpathRelative" : "cac:Language",
+    "xsdSequenceOrder" : [ { "cac:Language" : 49 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PaymentTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PaymentTerms",
+    "xpathRelative" : "cac:PaymentTerms",
+    "xsdSequenceOrder" : [ { "cac:PaymentTerms" : 34 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PostAwarProcess",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess",
+    "xpathRelative" : "cac:PostAwardProcess",
+    "xsdSequenceOrder" : [ { "cac:PostAwardProcess" : 53 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FinancialGuarantee",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee",
+    "xpathRelative" : "cac:RequiredFinancialGuarantee",
+    "xsdSequenceOrder" : [ { "cac:RequiredFinancialGuarantee" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecurityClearanceTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm",
+    "xpathRelative" : "cac:SecurityClearanceTerm",
+    "xsdSequenceOrder" : [ { "cac:SecurityClearanceTerm" : 55 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TendererLegalForm",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedParticipation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedProcurement",
+    "parentId" : "ND-LotReservedParticipation",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xpathRelative" : "cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LateTendererInformation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 }, { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderRecipient",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty",
+    "xpathRelative" : "cac:TenderRecipientParty",
+    "xsdSequenceOrder" : [ { "cac:TenderRecipientParty" : 42 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonUBLTenderingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SenderContact",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:SenderParty/cac:Contact",
+    "xpathRelative" : "cac:SenderParty/cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:SenderParty" : 28 }, { "cac:Contact" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTenderingProcess",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 40 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreviousNoticeReference",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AcceleratedProcedure",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedJustificationUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAward",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationCodeUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationPreviousUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationTextUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureFeaturesUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTypeUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTerms",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDistribution",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution",
+    "xpathRelative" : "cac:LotDistribution",
+    "xsdSequenceOrder" : [ { "cac:LotDistribution" : 52 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupComposition",
+    "parentId" : "ND-LotDistribution",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup",
+    "xpathRelative" : "cac:LotsGroup",
+    "xsdSequenceOrder" : [ { "cac:LotsGroup" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupCompositionLotReference",
+    "parentId" : "ND-GroupComposition",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLotReference" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CrossBorderLaw",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CrossBorderLawUnpublish",
+    "parentId" : "ND-CrossBorderLaw",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LocalLegalBasisNoID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LocalLegalBasisWithID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TendererQualificationRequest",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest",
+    "xpathRelative" : "cac:TendererQualificationRequest",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ExclusionGrounds",
+    "parentId" : "ND-TendererQualificationRequest",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement",
+    "xpathRelative" : "cac:SpecificTendererRequirement",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OperationType",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/efac:NoticePurpose",
+    "xpathRelative" : "efac:NoticePurpose",
+    "xsdSequenceOrder" : [ { "efac:NoticePurpose" : 37 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RootExtension",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResult",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult",
+    "xpathRelative" : "efac:NoticeResult",
+    "xsdSequenceOrder" : [ { "efac:NoticeResult" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeApproximateValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResultGroupFA",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework",
+    "xpathRelative" : "efac:GroupFramework",
+    "xsdSequenceOrder" : [ { "efac:GroupFramework" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupMaximalValueIdentifierUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupReestimatedValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResult",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult",
+    "xpathRelative" : "efac:LotResult",
+    "xsdSequenceOrder" : [ { "efac:LotResult" : 6 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-322-LotResult",
+    "captionFieldId" : "BT-13713-LotResult"
+  }, {
+    "id" : "ND-FinancingParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:FinancingParty",
+    "xpathRelative" : "cac:FinancingParty",
+    "xsdSequenceOrder" : [ { "cac:FinancingParty" : 7 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PayerParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:PayerParty",
+    "xpathRelative" : "cac:PayerParty",
+    "xsdSequenceOrder" : [ { "cac:PayerParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatistics",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsCountUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsTypeUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-BuyerReviewComplainants",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevewRequestsUnpublish",
+    "parentId" : "ND-BuyerReviewComplainants",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NotAwardedReasonUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xpathRelative" : "efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xsdSequenceOrder" : [ { "efac:DecisionReason" : 10 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueHighestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueLowestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinnerChosenUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultFAValues",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues",
+    "xpathRelative" : "efac:FrameworkAgreementValues",
+    "xsdSequenceOrder" : [ { "efac:FrameworkAgreementValues" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-MaximalValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReestimatedValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultTenderReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissions",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics",
+    "xpathRelative" : "efac:ReceivedSubmissionsStatistics",
+    "xsdSequenceOrder" : [ { "efac:ReceivedSubmissionsStatistics" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissionCountUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReceivedSubmissionTypeUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultContractReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementLotResult",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement",
+    "xpathRelative" : "efac:StrategicProcurement",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurement" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-StrategicProcurementInformationLotResult",
+    "parentId" : "ND-StrategicProcurementLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation",
+    "xpathRelative" : "efac:StrategicProcurementInformation",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementInformation" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementDetailsLotResult",
+    "parentId" : "ND-StrategicProcurementInformationLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails",
+    "xpathRelative" : "efac:ProcurementDetails",
+    "xsdSequenceOrder" : [ { "efac:ProcurementDetails" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementStatistics",
+    "parentId" : "ND-ProcurementDetailsLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics",
+    "xpathRelative" : "efac:StrategicProcurementStatistics",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementStatistics" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotTender",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 7 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-321-Tender",
+    "captionFieldId" : "BT-3201-Tender"
+  }, {
+    "id" : "ND-TenderAggregatedAmounts",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts",
+    "xpathRelative" : "efac:AggregatedAmounts",
+    "xsdSequenceOrder" : [ { "efac:AggregatedAmounts" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenue",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue",
+    "xpathRelative" : "efac:ConcessionRevenue",
+    "xsdSequenceOrder" : [ { "efac:ConcessionRevenue" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueBuyerUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueUserUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ValueConcessionDescriptionUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RewardsPenalties",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevenueAllocation",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OtherContractExecutionConditions",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xpathRelative" : "efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderRankUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderValueUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderVariantUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderOriginCountry",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin",
+    "xpathRelative" : "efac:Origin",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CountryOriginUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xpathRelative" : "efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedActivity",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm",
+    "xpathRelative" : "efac:SubcontractingTerm",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedContract",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xpathRelative" : "efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingDescriptionUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SettledContract",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-316-Contract",
+    "captionFieldId" : "BT-150-Contract"
+  }, {
+    "id" : "ND-ContractSignatory",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/cac:SignatoryParty",
+    "xpathRelative" : "cac:SignatoryParty",
+    "xsdSequenceOrder" : [ { "cac:SignatoryParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExtendedDurationJustification",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification",
+    "xpathRelative" : "efac:DurationJustification",
+    "xsdSequenceOrder" : [ { "efac:DurationJustification" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AssetList",
+    "parentId" : "ND-ExtendedDurationJustification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList",
+    "xpathRelative" : "efac:AssetsList",
+    "xsdSequenceOrder" : [ { "efac:AssetsList" : 2 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Asset",
+    "parentId" : "ND-AssetList",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset",
+    "xpathRelative" : "efac:Asset",
+    "xsdSequenceOrder" : [ { "efac:Asset" : 1 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractEUFunds",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding",
+    "xpathRelative" : "efac:Funding",
+    "xsdSequenceOrder" : [ { "efac:Funding" : 12 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SettledContractTenderReference",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderingParty",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty",
+    "xpathRelative" : "efac:TenderingParty",
+    "xsdSequenceOrder" : [ { "efac:TenderingParty" : 9 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-210-Tenderer"
+  }, {
+    "id" : "ND-SubContractor",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor",
+    "xpathRelative" : "efac:SubContractor",
+    "xsdSequenceOrder" : [ { "efac:SubContractor" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SubContractorTakerReference",
+    "parentId" : "ND-SubContractor",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor/efac:MainContractor",
+    "xpathRelative" : "efac:MainContractor",
+    "xsdSequenceOrder" : [ { "efac:MainContractor" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Tenderer",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:Tenderer",
+    "xpathRelative" : "efac:Tenderer",
+    "xsdSequenceOrder" : [ { "efac:Tenderer" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Organizations",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations",
+    "xpathRelative" : "efac:Organizations",
+    "xsdSequenceOrder" : [ { "efac:Organizations" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Organization",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization",
+    "xpathRelative" : "efac:Organization",
+    "xsdSequenceOrder" : [ { "efac:Organization" : 1 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-200-Organization-Company",
+    "captionFieldId" : "BT-500-Organization-Company"
+  }, {
+    "id" : "ND-Company",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company",
+    "xpathRelative" : "efac:Company",
+    "xsdSequenceOrder" : [ { "efac:Company" : 7 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyContact",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyLegalEntity",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity",
+    "xpathRelative" : "cac:PartyLegalEntity",
+    "xsdSequenceOrder" : [ { "cac:PartyLegalEntity" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CompanyAddress",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Touchpoint",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint",
+    "xpathRelative" : "efac:TouchPoint",
+    "xsdSequenceOrder" : [ { "efac:TouchPoint" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-201-Organization-TouchPoint",
+    "captionFieldId" : "BT-500-Organization-TouchPoint"
+  }, {
+    "id" : "ND-TouchpointContact",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TouchpointAddress",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OrganizationUboReference",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-UBO",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 2 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-202-UBO",
+    "captionFieldId" : "BT-500-UBO"
+  }, {
+    "id" : "ND-UBOContact",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 4 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBOAddress",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress",
+    "xpathRelative" : "cac:ResidenceAddress",
+    "xsdSequenceOrder" : [ { "cac:ResidenceAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBONationality",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/efac:Nationality",
+    "xpathRelative" : "efac:Nationality",
+    "xsdSequenceOrder" : [ { "efac:Nationality" : 6 } ],
+    "repeatable" : true
+  } ],
+  "fields" : [ {
+    "id" : "BT-02-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Type",
+    "btId" : "BT-02",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode",
+    "xpathRelative" : "cbc:NoticeTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributes" : [ "BT-03-notice" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "notice-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-03-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Form Type",
+    "btId" : "BT-03",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode/@listName",
+    "xpathRelative" : "cbc:NoticeTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-02-notice",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "form-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "code",
+    "attributes" : [ "BT-06-Lot-List" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02", "2" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "strategic-procurement",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot-List",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement Listname",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-06-Lot",
+    "presetValue" : "strategic-procurement",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-109-Lot",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification",
+    "xpathRelative" : "cbc:Justification",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "text-multilingual",
+    "attributes" : [ "BT-109-Lot-Language" ],
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-109-Lot-Language",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification Language",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification/@languageID",
+    "xpathRelative" : "cbc:Justification/@languageID",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-109-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "BT-137-Lot-Scheme" ],
+    "idScheme" : "LOT",
+    "schemeName" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "11", "12", "13" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^LOT-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot-Scheme",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier Schemename",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/@schemeName",
+    "xpathRelative" : "cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-137-Lot",
+    "presetValue" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "OPT-200-Organization-Company-Scheme" ],
+    "idScheme" : "ORG",
+    "schemeName" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^ORG-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company-Scheme",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier Schemename",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-200-Organization-Company",
+    "presetValue" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eforms-sdk-tests/tedefo-2740/valid/fields/fields.json b/src/test/resources/eforms-sdk-tests/tedefo-2740/valid/fields/fields.json
new file mode 100644
index 0000000..d6ebe84
--- /dev/null
+++ b/src/test/resources/eforms-sdk-tests/tedefo-2740/valid/fields/fields.json
@@ -0,0 +1,1678 @@
+{
+  "ublVersion" : "2.3",
+  "sdkVersion" : "eforms-sdk-1.8.0-SNAPSHOT",
+  "metadataDatabase" : {
+    "version" : "1.7.105",
+    "createdOn" : "2023-06-01T14:07:43"
+  },
+  "xmlStructure" : [ {
+    "id" : "ND-Root",
+    "xpathAbsolute" : "/*",
+    "xpathRelative" : "/*",
+    "repeatable" : false
+  }, {
+    "id" : "ND-AdditionalLanguage",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:AdditionalNoticeLanguage",
+    "xpathRelative" : "cac:AdditionalNoticeLanguage",
+    "xsdSequenceOrder" : [ { "cac:AdditionalNoticeLanguage" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractingParty",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ContractingParty",
+    "xpathRelative" : "cac:ContractingParty",
+    "xsdSequenceOrder" : [ { "cac:ContractingParty" : 29 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ServiceProvider",
+    "parentId" : "ND-ContractingParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ServiceProviderParty",
+    "parentId" : "ND-ServiceProvider",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty",
+    "xpathRelative" : "cac:ServiceProviderParty",
+    "xsdSequenceOrder" : [ { "cac:ServiceProviderParty" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProviderParty",
+    "parentId" : "ND-ServiceProviderParty",
+    "xpathAbsolute" : "/*/cac:ContractingParty/cac:Party/cac:ServiceProviderParty/cac:Party",
+    "xpathRelative" : "cac:Party",
+    "xsdSequenceOrder" : [ { "cac:Party" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureProcurementScope",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 41 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAdditionalCommodityClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureMainClassification",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureContractAdditionalNature",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedureTransportServiceType",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='transport-service']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcedurePlacePerformance",
+    "parentId" : "ND-ProcedurePlacePerformanceAdditionalInformation",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimate",
+    "parentId" : "ND-ProcedureProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureValueEstimateExtension",
+    "parentId" : "ND-ProcedureValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Lot",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLot" : 42 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "BT-137-Lot",
+    "captionFieldId" : "BT-21-Lot"
+  }, {
+    "id" : "ND-LotProcurementScope",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject",
+    "xpathRelative" : "cac:ProcurementProject",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProject" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAdditionalClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:AdditionalCommodityClassification",
+    "xpathRelative" : "cac:AdditionalCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:AdditionalCommodityClassification" : 17 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OptionsAndRenewals",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension",
+    "xpathRelative" : "cac:ContractExtension",
+    "xsdSequenceOrder" : [ { "cac:ContractExtension" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OptionsDescription",
+    "parentId" : "ND-OptionsAndRenewals",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ContractExtension/cac:Renewal/cac:Period",
+    "xpathRelative" : "cac:Renewal/cac:Period",
+    "xsdSequenceOrder" : [ { "cac:Renewal" : 7 }, { "cac:Period" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotMainClassification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:MainCommodityClassification",
+    "xpathRelative" : "cac:MainCommodityClassification",
+    "xsdSequenceOrder" : [ { "cac:MainCommodityClassification" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDuration",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:PlannedPeriod",
+    "xpathRelative" : "cac:PlannedPeriod",
+    "xsdSequenceOrder" : [ { "cac:PlannedPeriod" : 19 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AccessibilityJustification",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='accessibility']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotContractAdditionalNature",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='contract-nature']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEnvironmentalImpactType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='environmental-impact']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotGreenCriteria",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='gpp-criteria']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotInnovativeAcquisitionType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='innovative-acquisition']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotSocialObjectiveType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='social-objective']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementType",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xpathRelative" : "cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementAdditionalType" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPlacePerformance",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation",
+    "xpathRelative" : "cac:RealizedLocation",
+    "xsdSequenceOrder" : [ { "cac:RealizedLocation" : 18 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotPerformanceAddress",
+    "parentId" : "ND-LotPlacePerformance",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RealizedLocation/cac:Address",
+    "xpathRelative" : "cac:Address",
+    "xsdSequenceOrder" : [ { "cac:Address" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimate",
+    "parentId" : "ND-LotProcurementScope",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal",
+    "xpathRelative" : "cac:RequestedTenderTotal",
+    "xsdSequenceOrder" : [ { "cac:RequestedTenderTotal" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotValueEstimateExtension",
+    "parentId" : "ND-LotValueEstimate",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:RequestedTenderTotal/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcess",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotInfoRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AdditionalInformationRequestPeriod",
+    "xpathRelative" : "cac:AdditionalInformationRequestPeriod",
+    "xsdSequenceOrder" : [ { "cac:AdditionalInformationRequestPeriod" : 21 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AuctionTerms",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:AuctionTerms",
+    "xpathRelative" : "cac:AuctionTerms",
+    "xsdSequenceOrder" : [ { "cac:AuctionTerms" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecondStage",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 25 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FA",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement",
+    "xpathRelative" : "cac:FrameworkAgreement",
+    "xsdSequenceOrder" : [ { "cac:FrameworkAgreement" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FABuyerCategories",
+    "parentId" : "ND-FA",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xpathRelative" : "cac:SubsequentProcessTenderRequirement[cbc:Name/text()='buyer-categories']",
+    "xsdSequenceOrder" : [ { "cac:SubsequentProcessTenderRequirement" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotPreviousPlanning",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PublicOpening",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent",
+    "xpathRelative" : "cac:OpenTenderEvent",
+    "xsdSequenceOrder" : [ { "cac:OpenTenderEvent" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PublicOpeningPlace",
+    "parentId" : "ND-PublicOpening",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:OpenTenderEvent/cac:OccurenceLocation",
+    "xpathRelative" : "cac:OccurenceLocation",
+    "xsdSequenceOrder" : [ { "cac:OccurenceLocation" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ParticipationRequestPeriod",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ParticipationRequestReceptionPeriod",
+    "xpathRelative" : "cac:ParticipationRequestReceptionPeriod",
+    "xsdSequenceOrder" : [ { "cac:ParticipationRequestReceptionPeriod" : 20 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonEsubmission",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='no-esubmission-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubmissionDeadline",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:TenderSubmissionDeadlinePeriod",
+    "xpathRelative" : "cac:TenderSubmissionDeadlinePeriod",
+    "xsdSequenceOrder" : [ { "cac:TenderSubmissionDeadlinePeriod" : 17 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingProcessExtension",
+    "parentId" : "ND-LotTenderingProcess",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PMCAnswersDeadline",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AnswerReceptionPeriod",
+    "xpathRelative" : "efac:AnswerReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:AnswerReceptionPeriod" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-InterestExpressionReceptionPeriod",
+    "parentId" : "ND-LotTenderingProcessExtension",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:InterestExpressionReceptionPeriod",
+    "xpathRelative" : "efac:InterestExpressionReceptionPeriod",
+    "xsdSequenceOrder" : [ { "efac:InterestExpressionReceptionPeriod" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderingTerms",
+    "parentId" : "ND-Lot",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms",
+    "xpathRelative" : "cac:AllowedSubcontractTerms",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AllowedSubcontracting",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-allowed']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingObligation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xpathRelative" : "cac:AllowedSubcontractTerms[cbc:SubcontractingConditionsCode/@listName='subcontracting-obligation']",
+    "xsdSequenceOrder" : [ { "cac:AllowedSubcontractTerms" : 36 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReviewTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms",
+    "xpathRelative" : "cac:AppealTerms",
+    "xsdSequenceOrder" : [ { "cac:AppealTerms" : 48 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewPresentationPeriod",
+    "parentId" : "ND-LotReviewTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AppealTerms/cac:PresentationPeriod",
+    "xpathRelative" : "cac:PresentationPeriod",
+    "xsdSequenceOrder" : [ { "cac:PresentationPeriod" : 3 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AwardingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms",
+    "xpathRelative" : "cac:AwardingTerms",
+    "xsdSequenceOrder" : [ { "cac:AwardingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteria",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion",
+    "xpathRelative" : "cac:AwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:AwardingCriterion" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterion",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion",
+    "xpathRelative" : "cac:SubordinateAwardingCriterion",
+    "xsdSequenceOrder" : [ { "cac:SubordinateAwardingCriterion" : 15 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionParameters",
+    "parentId" : "ND-LotAwardCriterion",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardFixedCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberFixUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-fix']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionFixNumberUnpublish",
+    "parentId" : "ND-LotAwardFixedCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-fixed']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardThresholdCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotAwardCriterionThresholdNumberUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberThresholdUnpublish",
+    "parentId" : "ND-LotAwardThresholdCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-threshold']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-thr']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardWeightCriterionParameter",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xpathRelative" : "efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']",
+    "xsdSequenceOrder" : [ { "efac:AwardCriterionParameter" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionWeightNumberUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-num']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberWeightUnpublish",
+    "parentId" : "ND-LotAwardWeightCriterionParameter",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:AwardCriterionParameter[efbc:ParameterCode/@listName='number-weight']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-wei']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionDescriptionUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaNameUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-nam']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionTypeUnpublish",
+    "parentId" : "ND-LotAwardCriterionParameters",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/cac:SubordinateAwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriterionNumberComplicatedUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-com']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotAwardCriteriaOrderJustificationUnpublish",
+    "parentId" : "ND-LotAwardCriteria",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:AwardingCriterion/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='awa-cri-ord']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Prize",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:Prize",
+    "xpathRelative" : "cac:Prize",
+    "xsdSequenceOrder" : [ { "cac:Prize" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AwardingTermsJuryMember",
+    "parentId" : "ND-AwardingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:AwardingTerms/cac:TechnicalCommitteePerson",
+    "xpathRelative" : "cac:TechnicalCommitteePerson",
+    "xsdSequenceOrder" : [ { "cac:TechnicalCommitteePerson" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotProcurementDocument",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:CallForTendersDocumentReference",
+    "xpathRelative" : "cac:CallForTendersDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:CallForTendersDocumentReference" : 32 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExecutionRequirements",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='conditions']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-QualityTarget",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='customer-service']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-NDA",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='nda']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReservedExecution",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xpathRelative" : "cac:ContractExecutionRequirement[cbc:ExecutionRequirementCode/@listName='reserved-execution']",
+    "xsdSequenceOrder" : [ { "cac:ContractExecutionRequirement" : 38 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Participants",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList",
+    "xpathRelative" : "cac:EconomicOperatorShortList",
+    "xsdSequenceOrder" : [ { "cac:EconomicOperatorShortList" : 54 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreselectedParticipant",
+    "parentId" : "ND-Participants",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EconomicOperatorShortList/cac:PreSelectedParty",
+    "xpathRelative" : "cac:PreSelectedParty",
+    "xsdSequenceOrder" : [ { "cac:PreSelectedParty" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotEmploymentLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EmploymentLegislationDocumentReference",
+    "xpathRelative" : "cac:EmploymentLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EmploymentLegislationDocumentReference" : 30 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotEnvironmentalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:EnvironmentalLegislationDocumentReference",
+    "xpathRelative" : "cac:EnvironmentalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:EnvironmentalLegislationDocumentReference" : 29 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotFiscalLegislation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:FiscalLegislationDocumentReference",
+    "xpathRelative" : "cac:FiscalLegislationDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:FiscalLegislationDocumentReference" : 28 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotSubmissionLanguage",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:Language",
+    "xpathRelative" : "cac:Language",
+    "xsdSequenceOrder" : [ { "cac:Language" : 49 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PaymentTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PaymentTerms",
+    "xpathRelative" : "cac:PaymentTerms",
+    "xsdSequenceOrder" : [ { "cac:PaymentTerms" : 34 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PostAwarProcess",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:PostAwardProcess",
+    "xpathRelative" : "cac:PostAwardProcess",
+    "xsdSequenceOrder" : [ { "cac:PostAwardProcess" : 53 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-FinancialGuarantee",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:RequiredFinancialGuarantee",
+    "xpathRelative" : "cac:RequiredFinancialGuarantee",
+    "xsdSequenceOrder" : [ { "cac:RequiredFinancialGuarantee" : 26 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SecurityClearanceTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:SecurityClearanceTerm",
+    "xpathRelative" : "cac:SecurityClearanceTerm",
+    "xsdSequenceOrder" : [ { "cac:SecurityClearanceTerm" : 55 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TendererLegalForm",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cac:SpecificTendererRequirement)]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedParticipation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotReservedProcurement",
+    "parentId" : "ND-LotReservedParticipation",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)][not(cac:SpecificTendererRequirement/cbc:TendererRequirementTypeCode[@listName='missing-info-submission'])]/cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xpathRelative" : "cac:SpecificTendererRequirement[cbc:TendererRequirementTypeCode/@listName='reserved-procurement']",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LateTendererInformation",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xpathRelative" : "cac:TendererQualificationRequest[not(cbc:CompanyLegalFormCode)]/cac:SpecificTendererRequirement[not(cbc:TendererRequirementTypeCode[@listName='reserved-procurement'])]",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 }, { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderRecipient",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/cac:TenderRecipientParty",
+    "xpathRelative" : "cac:TenderRecipientParty",
+    "xsdSequenceOrder" : [ { "cac:TenderRecipientParty" : 42 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NonUBLTenderingTerms",
+    "parentId" : "ND-LotTenderingTerms",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingTerms/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SenderContact",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:SenderParty/cac:Contact",
+    "xpathRelative" : "cac:SenderParty/cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:SenderParty" : 28 }, { "cac:Contact" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTenderingProcess",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingProcess",
+    "xpathRelative" : "cac:TenderingProcess",
+    "xsdSequenceOrder" : [ { "cac:TenderingProcess" : 40 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-PreviousNoticeReference",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:NoticeDocumentReference",
+    "xpathRelative" : "cac:NoticeDocumentReference",
+    "xsdSequenceOrder" : [ { "cac:NoticeDocumentReference" : 22 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-AcceleratedProcedure",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedJustificationUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureAcceleratedUnpublish",
+    "parentId" : "ND-AcceleratedProcedure",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='accelerated-procedure']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-acc']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAward",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xpathRelative" : "cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']",
+    "xsdSequenceOrder" : [ { "cac:ProcessJustification" : 24 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationCodeUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-jus']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationPreviousUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-pre']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-DirectAwardJustificationTextUnpublish",
+    "parentId" : "ND-DirectAward",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/cac:ProcessJustification[cbc:ProcessReasonCode/@listName='direct-award-justification']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='dir-awa-tex']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureFeaturesUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-fea']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTypeUnpublish",
+    "parentId" : "ND-ProcedureTenderingProcess",
+    "xpathAbsolute" : "/*/cac:TenderingProcess/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='pro-typ']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ProcedureTerms",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/cac:TenderingTerms",
+    "xpathRelative" : "cac:TenderingTerms",
+    "xsdSequenceOrder" : [ { "cac:TenderingTerms" : 39 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotDistribution",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution",
+    "xpathRelative" : "cac:LotDistribution",
+    "xsdSequenceOrder" : [ { "cac:LotDistribution" : 52 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupComposition",
+    "parentId" : "ND-LotDistribution",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup",
+    "xpathRelative" : "cac:LotsGroup",
+    "xsdSequenceOrder" : [ { "cac:LotsGroup" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupCompositionLotReference",
+    "parentId" : "ND-GroupComposition",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:LotDistribution/cac:LotsGroup/cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xpathRelative" : "cac:ProcurementProjectLotReference[cbc:ID/@schemeName='Lot']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementProjectLotReference" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CrossBorderLaw",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CrossBorderLawUnpublish",
+    "parentId" : "ND-CrossBorderLaw",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='CrossBorderLaw']/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cro-bor-law']",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 }, { "efac:FieldsPrivacy" : 13 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LocalLegalBasisNoID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[cbc:ID/text()='LocalLegalBasis']",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LocalLegalBasisWithID",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xpathRelative" : "cac:ProcurementLegislationDocumentReference[not(cbc:ID/text()=('CrossBorderLaw','LocalLegalBasis'))]",
+    "xsdSequenceOrder" : [ { "cac:ProcurementLegislationDocumentReference" : 27 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TendererQualificationRequest",
+    "parentId" : "ND-ProcedureTerms",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest",
+    "xpathRelative" : "cac:TendererQualificationRequest",
+    "xsdSequenceOrder" : [ { "cac:TendererQualificationRequest" : 35 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ExclusionGrounds",
+    "parentId" : "ND-TendererQualificationRequest",
+    "xpathAbsolute" : "/*/cac:TenderingTerms/cac:TendererQualificationRequest/cac:SpecificTendererRequirement",
+    "xpathRelative" : "cac:SpecificTendererRequirement",
+    "xsdSequenceOrder" : [ { "cac:SpecificTendererRequirement" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-OperationType",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/efac:NoticePurpose",
+    "xpathRelative" : "efac:NoticePurpose",
+    "xsdSequenceOrder" : [ { "efac:NoticePurpose" : 37 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RootExtension",
+    "parentId" : "ND-Root",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xpathRelative" : "ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension",
+    "xsdSequenceOrder" : [ { "ext:UBLExtensions" : 1 }, { "ext:UBLExtension" : 1 }, { "ext:ExtensionContent" : 1 }, { "efext:EformsExtension" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResult",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult",
+    "xpathRelative" : "efac:NoticeResult",
+    "xsdSequenceOrder" : [ { "efac:NoticeResult" : 16 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeApproximateValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-app-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeValueUnpublish",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='not-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NoticeResultGroupFA",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework",
+    "xpathRelative" : "efac:GroupFramework",
+    "xsdSequenceOrder" : [ { "efac:GroupFramework" : 5 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-GroupMaximalValueIdentifierUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-ide']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupMaximumValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-GroupReestimatedValueUnpublish",
+    "parentId" : "ND-NoticeResultGroupFA",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:GroupFramework/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='gro-ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResult",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult",
+    "xpathRelative" : "efac:LotResult",
+    "xsdSequenceOrder" : [ { "efac:LotResult" : 6 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-322-LotResult",
+    "captionFieldId" : "BT-13713-LotResult"
+  }, {
+    "id" : "ND-FinancingParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:FinancingParty",
+    "xpathRelative" : "cac:FinancingParty",
+    "xsdSequenceOrder" : [ { "cac:FinancingParty" : 7 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-PayerParty",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/cac:PayerParty",
+    "xpathRelative" : "cac:PayerParty",
+    "xsdSequenceOrder" : [ { "cac:PayerParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatistics",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsCountUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReviewRequestsStatisticsTypeUnpublish",
+    "parentId" : "ND-ReviewRequestsStatistics",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='irregularity-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='buy-rev-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-BuyerReviewComplainants",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xpathRelative" : "efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']",
+    "xsdSequenceOrder" : [ { "efac:AppealRequestsStatistics" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevewRequestsUnpublish",
+    "parentId" : "ND-BuyerReviewComplainants",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:AppealRequestsStatistics[efbc:StatisticsCode/@listName='review-type']/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rev-req']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-NotAwardedReasonUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xpathRelative" : "efac:DecisionReason/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='no-awa-rea']",
+    "xsdSequenceOrder" : [ { "efac:DecisionReason" : 10 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueHighestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-hig']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TenderValueLowestUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-val-low']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinnerChosenUnpublish",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-cho']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultFAValues",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues",
+    "xpathRelative" : "efac:FrameworkAgreementValues",
+    "xsdSequenceOrder" : [ { "efac:FrameworkAgreementValues" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-MaximalValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='max-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReestimatedValueUnpublish",
+    "parentId" : "ND-LotResultFAValues",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:FrameworkAgreementValues/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ree-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultTenderReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissions",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics",
+    "xpathRelative" : "efac:ReceivedSubmissionsStatistics",
+    "xsdSequenceOrder" : [ { "efac:ReceivedSubmissionsStatistics" : 13 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ReceivedSubmissionCountUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-cou']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ReceivedSubmissionTypeUnpublish",
+    "parentId" : "ND-ReceivedSubmissions",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:ReceivedSubmissionsStatistics/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='rec-sub-typ']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotResultContractReference",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 14 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-StrategicProcurementLotResult",
+    "parentId" : "ND-LotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement",
+    "xpathRelative" : "efac:StrategicProcurement",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurement" : 15 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-StrategicProcurementInformationLotResult",
+    "parentId" : "ND-StrategicProcurementLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation",
+    "xpathRelative" : "efac:StrategicProcurementInformation",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementInformation" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementDetailsLotResult",
+    "parentId" : "ND-StrategicProcurementInformationLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails",
+    "xpathRelative" : "efac:ProcurementDetails",
+    "xsdSequenceOrder" : [ { "efac:ProcurementDetails" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ProcurementStatistics",
+    "parentId" : "ND-ProcurementDetailsLotResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotResult/efac:StrategicProcurement/efac:StrategicProcurementInformation/efac:ProcurementDetails/efac:StrategicProcurementStatistics",
+    "xpathRelative" : "efac:StrategicProcurementStatistics",
+    "xsdSequenceOrder" : [ { "efac:StrategicProcurementStatistics" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-LotTender",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 7 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-321-Tender",
+    "captionFieldId" : "BT-3201-Tender"
+  }, {
+    "id" : "ND-TenderAggregatedAmounts",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:AggregatedAmounts",
+    "xpathRelative" : "efac:AggregatedAmounts",
+    "xsdSequenceOrder" : [ { "efac:AggregatedAmounts" : 8 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenue",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue",
+    "xpathRelative" : "efac:ConcessionRevenue",
+    "xsdSequenceOrder" : [ { "efac:ConcessionRevenue" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueBuyerUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-buy']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ConcessionRevenueUserUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='con-rev-use']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-ValueConcessionDescriptionUnpublish",
+    "parentId" : "ND-ConcessionRevenue",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ConcessionRevenue/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='val-con-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RewardsPenalties",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/@listName='rewards-penalties']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-RevenueAllocation",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xpathRelative" : "efac:ContractTerm[efbc:TermCode/text()='all-rev-tic']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OtherContractExecutionConditions",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xpathRelative" : "efac:ContractTerm[not(efbc:TermCode/text()='all-rev-tic')][efbc:TermCode/@listName='contract-detail']",
+    "xsdSequenceOrder" : [ { "efac:ContractTerm" : 10 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderRankUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='ten-ran']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderValueUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-WinningTenderVariantUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='win-ten-var']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-LotTenderOriginCountry",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin",
+    "xpathRelative" : "efac:Origin",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CountryOriginUnpublish",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xpathRelative" : "efac:Origin/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='cou-ori']",
+    "xsdSequenceOrder" : [ { "efac:Origin" : 11 }, { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedActivity",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm",
+    "xpathRelative" : "efac:SubcontractingTerm",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractedContract",
+    "parentId" : "ND-LotTender",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xpathRelative" : "efac:SubcontractingTerm[efbc:TermCode/@listName='applicability']",
+    "xsdSequenceOrder" : [ { "efac:SubcontractingTerm" : 12 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-con']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingDescriptionUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-des']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingPercentageUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-per']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueKnownUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val-kno']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SubcontractingValueUnpublish",
+    "parentId" : "ND-SubcontractedActivity",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:LotTender/efac:SubcontractingTerm/efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xpathRelative" : "efac:FieldsPrivacy[efbc:FieldIdentifierCode/text()='sub-val']",
+    "xsdSequenceOrder" : [ { "efac:FieldsPrivacy" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-SettledContract",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract",
+    "xpathRelative" : "efac:SettledContract",
+    "xsdSequenceOrder" : [ { "efac:SettledContract" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-316-Contract",
+    "captionFieldId" : "BT-150-Contract"
+  }, {
+    "id" : "ND-ContractSignatory",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/cac:SignatoryParty",
+    "xpathRelative" : "cac:SignatoryParty",
+    "xsdSequenceOrder" : [ { "cac:SignatoryParty" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ExtendedDurationJustification",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification",
+    "xpathRelative" : "efac:DurationJustification",
+    "xsdSequenceOrder" : [ { "efac:DurationJustification" : 10 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-AssetList",
+    "parentId" : "ND-ExtendedDurationJustification",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList",
+    "xpathRelative" : "efac:AssetsList",
+    "xsdSequenceOrder" : [ { "efac:AssetsList" : 2 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Asset",
+    "parentId" : "ND-AssetList",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:DurationJustification/efac:AssetsList/efac:Asset",
+    "xpathRelative" : "efac:Asset",
+    "xsdSequenceOrder" : [ { "efac:Asset" : 1 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-ContractEUFunds",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:Funding",
+    "xpathRelative" : "efac:Funding",
+    "xsdSequenceOrder" : [ { "efac:Funding" : 12 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SettledContractTenderReference",
+    "parentId" : "ND-SettledContract",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:SettledContract/efac:LotTender",
+    "xpathRelative" : "efac:LotTender",
+    "xsdSequenceOrder" : [ { "efac:LotTender" : 11 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-TenderingParty",
+    "parentId" : "ND-NoticeResult",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty",
+    "xpathRelative" : "efac:TenderingParty",
+    "xsdSequenceOrder" : [ { "efac:TenderingParty" : 9 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-210-Tenderer"
+  }, {
+    "id" : "ND-SubContractor",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor",
+    "xpathRelative" : "efac:SubContractor",
+    "xsdSequenceOrder" : [ { "efac:SubContractor" : 3 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-SubContractorTakerReference",
+    "parentId" : "ND-SubContractor",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:SubContractor/efac:MainContractor",
+    "xpathRelative" : "efac:MainContractor",
+    "xsdSequenceOrder" : [ { "efac:MainContractor" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Tenderer",
+    "parentId" : "ND-TenderingParty",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:NoticeResult/efac:TenderingParty/efac:Tenderer",
+    "xpathRelative" : "efac:Tenderer",
+    "xsdSequenceOrder" : [ { "efac:Tenderer" : 2 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-Organizations",
+    "parentId" : "ND-RootExtension",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations",
+    "xpathRelative" : "efac:Organizations",
+    "xsdSequenceOrder" : [ { "efac:Organizations" : 1 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Organization",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization",
+    "xpathRelative" : "efac:Organization",
+    "xsdSequenceOrder" : [ { "efac:Organization" : 1 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-200-Organization-Company",
+    "captionFieldId" : "BT-500-Organization-Company"
+  }, {
+    "id" : "ND-Company",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company",
+    "xpathRelative" : "efac:Company",
+    "xsdSequenceOrder" : [ { "efac:Company" : 7 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyContact",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 9 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-CompanyLegalEntity",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyLegalEntity",
+    "xpathRelative" : "cac:PartyLegalEntity",
+    "xsdSequenceOrder" : [ { "cac:PartyLegalEntity" : 8 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-CompanyAddress",
+    "parentId" : "ND-Company",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-Touchpoint",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint",
+    "xpathRelative" : "efac:TouchPoint",
+    "xsdSequenceOrder" : [ { "efac:TouchPoint" : 8 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-201-Organization-TouchPoint",
+    "captionFieldId" : "BT-500-Organization-TouchPoint"
+  }, {
+    "id" : "ND-TouchpointContact",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 6 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-TouchpointAddress",
+    "parentId" : "ND-Touchpoint",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:TouchPoint/cac:PostalAddress",
+    "xpathRelative" : "cac:PostalAddress",
+    "xsdSequenceOrder" : [ { "cac:PostalAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-OrganizationUboReference",
+    "parentId" : "ND-Organization",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 6 } ],
+    "repeatable" : true
+  }, {
+    "id" : "ND-UBO",
+    "parentId" : "ND-Organizations",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner",
+    "xpathRelative" : "efac:UltimateBeneficialOwner",
+    "xsdSequenceOrder" : [ { "efac:UltimateBeneficialOwner" : 2 } ],
+    "repeatable" : true,
+    "identifierFieldId" : "OPT-202-UBO",
+    "captionFieldId" : "BT-500-UBO"
+  }, {
+    "id" : "ND-UBOContact",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:Contact",
+    "xpathRelative" : "cac:Contact",
+    "xsdSequenceOrder" : [ { "cac:Contact" : 4 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBOAddress",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/cac:ResidenceAddress",
+    "xpathRelative" : "cac:ResidenceAddress",
+    "xsdSequenceOrder" : [ { "cac:ResidenceAddress" : 5 } ],
+    "repeatable" : false
+  }, {
+    "id" : "ND-UBONationality",
+    "parentId" : "ND-UBO",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:UltimateBeneficialOwner/efac:Nationality",
+    "xpathRelative" : "efac:Nationality",
+    "xsdSequenceOrder" : [ { "efac:Nationality" : 6 } ],
+    "repeatable" : true
+  } ],
+  "fields" : [ {
+    "id" : "BT-02-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Notice Type",
+    "btId" : "BT-02",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode",
+    "xpathRelative" : "cbc:NoticeTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributes" : [ "BT-03-notice" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "notice-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-03-notice",
+    "parentNodeId" : "ND-Root",
+    "name" : "Form Type",
+    "btId" : "BT-03",
+    "xpathAbsolute" : "/*/cbc:NoticeTypeCode/@listName",
+    "xpathRelative" : "cbc:NoticeTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:NoticeTypeCode" : 19 } ],
+    "type" : "code",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-02-notice",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "form-type",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode",
+    "xpathRelative" : "cbc:ProcurementTypeCode",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "code",
+    "attributes" : [ "BT-06-Lot-List" ],
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "strategic-procurement",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-06-Lot-List",
+    "parentNodeId" : "ND-StrategicProcurementType",
+    "name" : "Strategic Procurement Listname",
+    "btId" : "BT-06",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:ProcurementProject/cac:ProcurementAdditionalType[cbc:ProcurementTypeCode/@listName='strategic-procurement']/cbc:ProcurementTypeCode/@listName",
+    "xpathRelative" : "cbc:ProcurementTypeCode/@listName",
+    "xsdSequenceOrder" : [ { "cbc:ProcurementTypeCode" : 2 } ],
+    "type" : "text",
+    "attributeName" : "listName",
+    "attributeOf" : "BT-06-Lot",
+    "presetValue" : "strategic-procurement",
+    "legalType" : "CODE",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-109-Lot",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification",
+    "xpathRelative" : "cbc:Justification",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "text-multilingual",
+    "attributes" : [ "BT-109-Lot-Language" ],
+    "legalType" : "TEXT",
+    "maxLength" : 6000,
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "14", "15", "19", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    }
+  }, {
+    "id" : "BT-109-Lot-Language",
+    "parentNodeId" : "ND-FA",
+    "name" : "Framework Duration Justification Language",
+    "btId" : "BT-109",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cac:TenderingProcess/cac:FrameworkAgreement/cbc:Justification/@languageID",
+    "xpathRelative" : "cbc:Justification/@languageID",
+    "xsdSequenceOrder" : [ { "cbc:Justification" : 4 } ],
+    "type" : "code",
+    "attributeName" : "languageID",
+    "attributeOf" : "BT-109-Lot",
+    "legalType" : "TEXT",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "codeList" : {
+      "value" : {
+        "id" : "eu-official-language",
+        "type" : "flat"
+      },
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID",
+    "xpathRelative" : "cbc:ID",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "BT-137-Lot-Scheme" ],
+    "idScheme" : "LOT",
+    "schemeName" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^LOT-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "BT-137-Lot-Scheme",
+    "parentNodeId" : "ND-Lot",
+    "name" : "Purpose Lot Identifier Schemename",
+    "btId" : "BT-137",
+    "xpathAbsolute" : "/*/cac:ProcurementProjectLot[cbc:ID/@schemeName='Lot']/cbc:ID/@schemeName",
+    "xpathRelative" : "cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "BT-137-Lot",
+    "presetValue" : "Lot",
+    "legalType" : "IDENTIFIER",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "id",
+    "attributes" : [ "OPT-200-Organization-Company-Scheme" ],
+    "idScheme" : "ORG",
+    "schemeName" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    },
+    "forbidden" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "X01", "X02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "mandatory" : {
+      "value" : false,
+      "severity" : "ERROR",
+      "constraints" : [ {
+        "noticeTypes" : [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "CEI", "T01", "T02" ],
+        "value" : true,
+        "severity" : "ERROR"
+      } ]
+    },
+    "pattern" : {
+      "value" : "^ORG-\\d{4}$",
+      "severity" : "ERROR"
+    }
+  }, {
+    "id" : "OPT-200-Organization-Company-Scheme",
+    "parentNodeId" : "ND-Company",
+    "name" : "Organisation Technical Identifier Schemename",
+    "btId" : "OPT-200",
+    "xpathAbsolute" : "/*/ext:UBLExtensions/ext:UBLExtension/ext:ExtensionContent/efext:EformsExtension/efac:Organizations/efac:Organization/efac:Company/cac:PartyIdentification/cbc:ID/@schemeName",
+    "xpathRelative" : "cac:PartyIdentification/cbc:ID/@schemeName",
+    "xsdSequenceOrder" : [ { "cac:PartyIdentification" : 4 }, { "cbc:ID" : 2 } ],
+    "type" : "text",
+    "attributeName" : "schemeName",
+    "attributeOf" : "OPT-200-Organization-Company",
+    "presetValue" : "organization",
+    "repeatable" : {
+      "value" : false,
+      "severity" : "ERROR"
+    }
+  } ]
+}
\ No newline at end of file
diff --git a/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2740.feature b/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2740.feature
new file mode 100644
index 0000000..21e1405
--- /dev/null
+++ b/src/test/resources/eu/europa/ted/eforms/sdk/analysis/cucumber/tedefo-2740.feature
@@ -0,0 +1,25 @@
+@tedefo-2740
+Feature: Fields - Field validation
+  TEDEFO-2740: Values in noticeTypes property are not repeated
+  Test files under "src/test/resources/eforms-sdk-tests/tedefo-2740"
+
+  Background:
+    Given The following rules
+      | Field constraints do not have duplicate notice types identifiers |
+
+  Scenario: All fields have no duplicate notice types
+    Given A "tedefo-2740" folder with "valid" files
+    When I load all fields
+    And I execute validation
+    Then I should get 0 SDK validation errors
+
+  Scenario Outline: Some fields have duplicate notice types
+    Given A "tedefo-2740" folder with "invalid" files
+    When I load all fields
+    And I execute validation
+    Then Rule "<expected rule>" should have been fired
+    And I should get 2 SDK validation errors
+
+    Examples:
+      | expected rule                     |
+      | Field constraints do not have duplicate notice types identifiers |

From ad2136bdbe999fb011eeb19dd718dc0dcad93b82 Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Tue, 17 Oct 2023 15:25:41 +0200
Subject: [PATCH 7/8] refactor: Use XPathProcessor from eforms-core

Use XPathProcessor from eforms-core instead of our own XPath parser.

Update dependency on eforms-core to 1.2.0, which has this new feature.

Also rename getXpathRelativeStepCount to getXpathRelativeElementCount to
make it clearer it only count XPath steps that are elements, and not
attributes.
---
 pom.xml                                       |   2 +-
 .../eforms/sdk/analysis/fact/FieldFact.java   |  21 +-
 .../eforms/sdk/analysis/fact/NodeFact.java    |   9 +-
 .../sdk/analysis/util/XPathSplitter.java      | 219 ------------------
 .../validator/XmlSchemaValidator.java         |  10 +-
 .../analysis/drools/fieldsAndNodesRules.drl   |   4 +-
 6 files changed, 26 insertions(+), 239 deletions(-)
 delete mode 100644 src/main/java/eu/europa/ted/eforms/sdk/analysis/util/XPathSplitter.java

diff --git a/pom.xml b/pom.xml
index b91f7b7..d070c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
-    <version.eforms-core-java>1.0.5</version.eforms-core-java>
+    <version.eforms-core-java>1.2.0</version.eforms-core-java>
     <version.efx-toolkit>2.0.0-alpha.1</version.efx-toolkit>
 
     <!-- Version - Third-party libraries -->
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
index e91a653..5450a79 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/FieldFact.java
@@ -15,9 +15,9 @@
 import eu.europa.ted.eforms.sdk.analysis.domain.field.FieldPrivacy;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlElementPosition;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlStructureNode;
-import eu.europa.ted.eforms.sdk.analysis.util.XPathSplitter;
 import eu.europa.ted.eforms.sdk.analysis.util.XPathUtils;
-import eu.europa.ted.eforms.sdk.analysis.util.XPathSplitter.StepInfo;
+import eu.europa.ted.eforms.xpath.XPathInfo;
+import eu.europa.ted.eforms.xpath.XPathProcessor;
 
 public class FieldFact implements SdkComponentFact<String> {
   private static final long serialVersionUID = -8325643682910825716L;
@@ -120,16 +120,22 @@ public String getXpathRelative() {
     return field.getXpathRelative();
   }
 
-  public int getXpathRelativeStepCount() {
+  public int getXpathRelativeElementCount() {
     if (stepCount == 0 && getXpathRelative() != null) {
-      stepCount = XPathSplitter.getStepElementNames(getXpathRelative()).size();
+      XPathInfo xpathInfo = XPathProcessor.parse(getXpathRelative());
+      stepCount = xpathInfo.getSteps().size();
+      if (xpathInfo.isAttribute()) {
+        // we don't want to count attributes
+        stepCount--;
+      }
     }
     return stepCount;
   }
 
   public List<String> getInvalidXpathRelativeSteps() {
-    List<String> badSteps = XPathSplitter.getStepElementNames(getXpathRelative()).stream()
-      .filter(s -> XPathUtils.isAscendingStep(s))
+    List<String> badSteps = XPathProcessor.parse(getXpathRelative()).getSteps().stream()
+      .map(s -> s.getStepText())
+      .filter(x -> XPathUtils.isAscendingStep(x))
       .collect(Collectors.toList());
 
     return badSteps;
@@ -143,8 +149,7 @@ public String getType() {
    * Return true if the last step of the relative path corresponds to an XML attribute.
    */
   public boolean isAttribute() {
-    List<StepInfo> steps = XPathSplitter.getSteps(getXpathRelative());
-    return steps.get(steps.size() - 1).isAttribute();
+    return XPathProcessor.parse(getXpathRelative()).isAttribute();
   }
 
   public String getAttributeOf() {
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NodeFact.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NodeFact.java
index 1576b42..6eefc95 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NodeFact.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/fact/NodeFact.java
@@ -6,8 +6,8 @@
 
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlElementPosition;
 import eu.europa.ted.eforms.sdk.analysis.domain.field.XmlStructureNode;
-import eu.europa.ted.eforms.sdk.analysis.util.XPathSplitter;
 import eu.europa.ted.eforms.sdk.analysis.util.XPathUtils;
+import eu.europa.ted.eforms.xpath.XPathProcessor;
 
 public class NodeFact implements SdkComponentFact<String> {
   private static final long serialVersionUID = -6237630016231337698L;
@@ -80,15 +80,16 @@ public String getXpathRelative() {
     return node.getXpathRelative();
   }
 
-  public int getXpathRelativeStepCount() {
+  public int getXpathRelativeElementCount() {
     if (stepCount == 0 && getXpathRelative() != null) {
-      stepCount = XPathSplitter.getStepElementNames(getXpathRelative()).size();
+      stepCount = XPathProcessor.parse(getXpathRelative()).getSteps().size();
     }
     return stepCount;
   }
 
   public List<String> getInvalidXpathRelativeSteps() {
-    List<String> badSteps = XPathSplitter.getStepElementNames(getXpathRelative()).stream()
+    List<String> badSteps = XPathProcessor.parse(getXpathRelative()).getSteps().stream()
+      .map(s -> s.getStepText())
       .filter(s -> XPathUtils.isAscendingStep(s))
       .collect(Collectors.toList());
 
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/util/XPathSplitter.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/util/XPathSplitter.java
deleted file mode 100644
index adfcb5b..0000000
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/util/XPathSplitter.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package eu.europa.ted.eforms.sdk.analysis.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.misc.Interval;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-import eu.europa.ted.efx.xpath.XPath20BaseListener;
-import eu.europa.ted.efx.xpath.XPath20Lexer;
-import eu.europa.ted.efx.xpath.XPath20Parser;
-import eu.europa.ted.efx.xpath.XPath20Parser.AxisstepContext;
-import eu.europa.ted.efx.xpath.XPath20Parser.FilterexprContext;
-import eu.europa.ted.efx.xpath.XPath20Parser.PredicateContext;
-
-public class XPathSplitter extends XPath20BaseListener {
-
-  private final CharStream inputStream;
-  private final LinkedList<StepInfo> steps = new LinkedList<>();
-
-  public XPathSplitter(CharStream inputStream) {
-    this.inputStream = inputStream;
-  }
-
-  /**
-   * Parses the given xpath and returns a list containing a {@link StepInfo} for
-   * each step that the XPath is comprised of.
-   */
-  public static List<StepInfo> getSteps(String xpath) {
-
-    final CharStream inputStream = CharStreams.fromString(xpath);
-    final XPath20Lexer lexer = new XPath20Lexer(inputStream);
-    final CommonTokenStream tokens = new CommonTokenStream(lexer);
-    final XPath20Parser parser = new XPath20Parser(tokens);
-    final ParseTree tree = parser.xpath();
-
-    final ParseTreeWalker walker = new ParseTreeWalker();
-    final XPathSplitter xpathParser = new XPathSplitter(inputStream);
-    walker.walk(xpathParser, tree);
-
-    return xpathParser.steps;
-  }
-
- /**
-   * Parses the given xpath and returns a list containing the element name for
-   * each step that the XPath is comprised of.
-   * A step corresponding to an attribute is ignored, and predicates are removed from each element.
-   * So for "a/b/ns:foo[x = y]/@attr" this will return ("a", "b", "ns:foo")
-   */
-  public static List<String> getStepElementNames(String xpath) {
-    return getSteps(xpath).stream()
-        .filter(s -> !s.isAttribute())
-        .map(StepInfo::getElementName)
-        .collect(Collectors.toList());
-  }
-
-  /**
-   * Helper method that returns the input text that matched a parser rule context. It is useful
-   * because {@link ParserRuleContext#getText()} omits whitespace and other lexer tokens in the
-   * HIDDEN channel.
-   *
-   * @param context
-   * @return
-   */
-  private String getInputText(ParserRuleContext context) {
-    return this.inputStream
-        .getText(new Interval(context.start.getStartIndex(), context.stop.getStopIndex()));
-  }
-
-  int predicateMode = 0;
-
-  private Boolean inPredicateMode() {
-    return predicateMode > 0;
-  }
-
-  @Override
-  public void exitAxisstep(AxisstepContext ctx) {
-    if (inPredicateMode()) {
-      return;
-    }
-
-    // When we recognize a step, we add it to the queue if is is empty.
-    // If the queue is not empty, and the depth of the new step is not smaller than
-    // the depth of the last step in the queue, then this step needs to be added to
-    // the queue too.
-    // Otherwise, the last step in the queue is a sub-expression of the new step,
-    // and we need to
-    // replace it in the queue with the new step.
-    if (this.steps.isEmpty() || !this.steps.getLast().isPartOf(ctx.getSourceInterval())) {
-      this.steps.offer(new AxisStepInfo(ctx, this::getInputText));
-    } else {
-      Interval removedInterval = ctx.getSourceInterval();
-      while(!this.steps.isEmpty() && this.steps.getLast().isPartOf(removedInterval)) {
-        this.steps.removeLast();
-      }
-      this.steps.offer(new AxisStepInfo(ctx, this::getInputText));
-    }    
-  }
-
-  @Override
-  public void exitFilterexpr(FilterexprContext ctx) {
-    if (inPredicateMode()) {
-      return;
-    }
-
-    // Same logic as for axis steps here (sse exitAxisstep).
-    if (this.steps.isEmpty() || !this.steps.getLast().isPartOf(ctx.getSourceInterval())) {
-      this.steps.offer(new FilterStepInfo(ctx, this::getInputText));
-    } else {
-      Interval removedInterval = ctx.getSourceInterval();
-      while(!this.steps.isEmpty() && this.steps.getLast().isPartOf(removedInterval)) {
-        this.steps.removeLast();
-      }
-      this.steps.offer(new FilterStepInfo(ctx, this::getInputText));
-    }
-  }
-
-  @Override
-  public void enterPredicate(PredicateContext ctx) {
-    this.predicateMode++;
-  }
-
-  @Override
-  public void exitPredicate(PredicateContext ctx) {
-    this.predicateMode--;
-  }
-
-  public class AxisStepInfo extends StepInfo {
-
-    public AxisStepInfo(AxisstepContext ctx, Function<ParserRuleContext, String> getInputText) {
-      super(ctx.reversestep() != null? getInputText.apply(ctx.reversestep()) : getInputText.apply(ctx.forwardstep()), 
-      ctx.predicatelist().predicate().stream().map(getInputText).collect(Collectors.toList()), ctx.getSourceInterval());
-    }
-  }
-
-  public class FilterStepInfo extends StepInfo {
-
-    public FilterStepInfo(FilterexprContext ctx, Function<ParserRuleContext, String> getInputText) {
-      super(getInputText.apply(ctx.primaryexpr()), 
-      ctx.predicatelist().predicate().stream().map(getInputText).collect(Collectors.toList()), ctx.getSourceInterval());
-    }
-  }
-
-  public class StepInfo {
-    String stepText;
-    List<String> predicates;
-    int a;
-    int b;
-
-    protected StepInfo(String stepText, List<String> predicates, Interval interval) {
-      this.stepText = stepText;
-      this.predicates = predicates;
-      this.a = interval.a;
-      this.b = interval.b;
-    }
-
-    public String getElementName() {
-      return stepText;
-    }
-
-    public Boolean isAttribute() {
-      return this.stepText.startsWith("@");
-    }
-
-    public Boolean isVariableStep() {
-      return this.stepText.startsWith("$");
-    }
-
-    public String getPredicateText() {
-      return String.join("", this.predicates);
-    }
-
-    public Boolean isTheSameAs(final StepInfo contextStep) {
-
-      // First check the step texts are the different.
-      if (!Objects.equals(contextStep.stepText, this.stepText)) {
-        return false;
-      }
-
-      // If one of the two steps has more predicates that the other,
-      if (this.predicates.size() != contextStep.predicates.size()) {
-        // then the steps are the same is the path has no predicates
-        // or all the predicates of the path are also found in the context.
-        return this.predicates.isEmpty() || contextStep.predicates.containsAll(this.predicates);
-      }
-
-      // If there are no predicates then the steps are the same.
-      if (this.predicates.isEmpty()) {
-        return true;
-      }
-
-      // If there is only one predicate in each step, then we can do a quick comparison.
-      if (this.predicates.size() == 1) {
-        return Objects.equals(contextStep.predicates.get(0), this.predicates.get(0));
-      }
-
-      // Both steps contain multiple predicates.
-      // We need to compare them one by one.
-      // First we make a copy so that we can sort them without affecting the original lists.
-      List<String> pathPredicates = new ArrayList<>(this.predicates);
-      List<String> contextPredicates = new ArrayList<>(contextStep.predicates);
-      Collections.sort(pathPredicates);
-      Collections.sort(contextPredicates);
-      return pathPredicates.equals(contextPredicates);
-    }
-
-    public Boolean isPartOf(Interval interval) {
-      return this.a >= interval.a && this.b <= interval.b;
-    }
-  }
-}
diff --git a/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/XmlSchemaValidator.java b/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/XmlSchemaValidator.java
index 60d0b6e..f852756 100644
--- a/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/XmlSchemaValidator.java
+++ b/src/main/java/eu/europa/ted/eforms/sdk/analysis/validator/XmlSchemaValidator.java
@@ -31,8 +31,9 @@
 import eu.europa.ted.eforms.sdk.analysis.enums.ValidationStatusEnum;
 import eu.europa.ted.eforms.sdk.analysis.fact.FieldFact;
 import eu.europa.ted.eforms.sdk.analysis.fact.NodeFact;
-import eu.europa.ted.eforms.sdk.analysis.util.XPathSplitter;
 import eu.europa.ted.eforms.sdk.analysis.vo.ValidationResult;
+import eu.europa.ted.eforms.xpath.XPathProcessor;
+import eu.europa.ted.eforms.xpath.XPathStep;
 
 /**
  * Validates the content of the XSD files in the SDK, and their consistency with other files.
@@ -161,8 +162,7 @@ private void checkNodeRepeatability(XmlStructureNode node) {
    * removing any predicate.
    */
   private String getFirstElementName(String xpath) {
-    List<String> names = XPathSplitter.getStepElementNames(xpath);
-    return names.get(0);
+    return XPathProcessor.parse(xpath).getSteps().get(0).getStepText();
   }
 
   /**
@@ -170,8 +170,8 @@ private String getFirstElementName(String xpath) {
    * removing any predicate.
    */
   private String getLastElementName(String xpath) {
-    List<String> names = XPathSplitter.getStepElementNames(xpath);
-    return names.get(names.size() - 1);
+    List<XPathStep> steps = XPathProcessor.parse(xpath).getSteps();
+    return steps.get(steps.size() - 1).getStepText();
   }
 
   /**
diff --git a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
index 97f8dfb..8e12d75 100644
--- a/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
+++ b/src/main/resources/eu/europa/ted/eforms/sdk/analysis/drools/fieldsAndNodesRules.drl
@@ -153,14 +153,14 @@ end
 
 rule "Every field has XSD sequence order consistent with relative xpath"
 when
-  /fields[ $f: this, xsdSequenceOrderCount != xpathRelativeStepCount ]
+  /fields[ $f: this, xsdSequenceOrderCount != xpathRelativeElementCount ]
 then
   results.add(new ValidationResult($f, "Field XSD sequence order is inconsistent with relative XPath.", ValidationStatusEnum.ERROR));
 end
 
 rule "Every non-root node has XSD sequence order consistent with relative xpath"
 when
-  /nodes[ $n: this, parentId != null, xsdSequenceOrderCount != xpathRelativeStepCount ]
+  /nodes[ $n: this, parentId != null, xsdSequenceOrderCount != xpathRelativeElementCount ]
 then
   results.add(new ValidationResult($n, "Node XSD sequence order is inconsistent with relative XPath.", ValidationStatusEnum.ERROR));
 end

From ff8afb52947409b8a5fd3633036beac9813a22da Mon Sep 17 00:00:00 2001
From: Bertrand Lorentz <bertrand.lorentz@publications.europa.eu>
Date: Mon, 20 Nov 2023 16:08:34 +0100
Subject: [PATCH 8/8] pom: Update version to 1.10.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d070c9d..543d463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.europa.ted.eforms</groupId>
   <artifactId>eforms-sdk-analyzer</artifactId>
-  <version>1.10.0-SNAPSHOT</version>
+  <version>1.10.0</version>
   <packaging>kjar</packaging>
 
   <name>eforms-sdk-analyzer</name>
@@ -29,7 +29,7 @@
     <finalName>${project.artifactId}-${project.version}</finalName>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.outputTimestamp>2023-08-24T14:17:24Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-11-20T13:50:04Z</project.build.outputTimestamp>
 
     <java.version>11</java.version>