diff --git a/procedure_tools/client.py b/procedure_tools/client.py
index 0a16f46..84e782e 100644
--- a/procedure_tools/client.py
+++ b/procedure_tools/client.py
@@ -3,7 +3,7 @@
 import json
 import logging
 from base64 import b64encode
-from copy import copy, deepcopy
+from copy import copy
 from datetime import timedelta
 
 from procedure_tools.utils.date import get_utcnow, parse_date_header
@@ -164,6 +164,7 @@ class CDBClient(BaseCDBClient):
     TENDERS_BIDS_RES_COLLECTION_PATH = "tenders/{}/bids/{}/requirement_responses"
     TENDERS_AWARDS_COLLECTION_PATH = "tenders/{}/awards"
     TENDERS_AWARDS_PATH = "tenders/{}/awards/{}"
+    TENDERS_AWARDS_DOCS_COLLECTION_PATH = "tenders/{}/awards/{}/documents"
     TENDERS_CONTRACTS_COLLECTION_PATH = "tenders/{}/contracts"
     TENDERS_CONTRACTS_PATH = "tenders/{}/contracts/{}"
     TENDERS_QUALIFICATIONS_COLLECTION_PATH = "tenders/{}/qualifications"
@@ -374,6 +375,13 @@ def patch_tender_award(self, tender_id, award_id, acc_token, json, **kwargs):
         path = self.get_api_path(sub_path, acc_token=acc_token)
         return self.patch(path, json, **kwargs)
 
+    def post_tender_award_document(
+        self, tender_id, award_id, acc_token, json, **kwargs
+    ):
+        sub_path = self.TENDERS_AWARDS_DOCS_COLLECTION_PATH.format(tender_id, award_id)
+        path = self.get_api_path(sub_path, acc_token=acc_token)
+        return self.post(path, json, **kwargs)
+
     def get_tender_award_complaints(self, tender_id, award_id, **kwargs):
         sub_path = self.TENDERS_AWARDS_COMPLAINTS_COLLECTION_PATH.format(
             tender_id, award_id
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_file.p7s b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_1_document_file.p7s
similarity index 100%
rename from procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_file.p7s
rename to procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_1_document_file.p7s
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.central/2310_award_patch_0_0.json
rename to procedure_tools/data/aboveThreshold.features/2310_award_patch_0_0_2.json
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.central/2310_award_patch_0_1.json
rename to procedure_tools/data/aboveThreshold.features/2310_award_patch_0_1_2.json
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_1_1.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThreshold.features/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThreshold.features/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThreshold.features/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3.json b/procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.central/2310_award_patch_3_3.json
rename to procedure_tools/data/aboveThreshold.features/2310_award_patch_3_3_2.json
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.features/2310_award_patch_0_0.json
rename to procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_0_2.json
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.features/2310_award_patch_0_1.json
rename to procedure_tools/data/aboveThreshold.lcc/2310_award_patch_0_1_2.json
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_1_1.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThreshold.lcc/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThreshold.lcc/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThreshold.lcc/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3.json b/procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.features/2310_award_patch_3_3.json
rename to procedure_tools/data/aboveThreshold.lcc/2310_award_patch_3_3_2.json
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_0.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_0.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_0_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold/2310_award_patch_0_0.json
rename to procedure_tools/data/aboveThreshold/2310_award_patch_0_0_2.json
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_1.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_1.json b/procedure_tools/data/aboveThreshold/2310_award_patch_0_1_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold/2310_award_patch_0_1.json
rename to procedure_tools/data/aboveThreshold/2310_award_patch_0_1_2.json
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_1_1.json b/procedure_tools/data/aboveThreshold/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThreshold/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThreshold/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_2_2.json b/procedure_tools/data/aboveThreshold/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThreshold/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThreshold/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_3_3.json b/procedure_tools/data/aboveThreshold/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThreshold/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_3_3.json b/procedure_tools/data/aboveThreshold/2310_award_patch_3_3_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold/2310_award_patch_3_3.json
rename to procedure_tools/data/aboveThreshold/2310_award_patch_3_3_2.json
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_2.json
similarity index 64%
rename from procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0.json
rename to procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_2.json
index fa2c616..8d80434 100644
--- a/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0.json
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_0_2.json
@@ -1,6 +1,5 @@
 {
   "data": {
-    "qualified": true,
     "status": "active"
   }
 }
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_2.json
similarity index 64%
rename from procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0.json
rename to procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_2.json
index fa2c616..8d80434 100644
--- a/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0.json
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_0_1_2.json
@@ -1,6 +1,5 @@
 {
   "data": {
-    "qualified": true,
     "status": "active"
   }
 }
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_1_1.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdEU.features/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThresholdEU.features/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThresholdEU.features/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_0.json b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_2.json
similarity index 64%
rename from procedure_tools/data/negotiation.quick/2310_award_patch_0_0.json
rename to procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_2.json
index fa2c616..8d80434 100644
--- a/procedure_tools/data/negotiation.quick/2310_award_patch_0_0.json
+++ b/procedure_tools/data/aboveThresholdEU.features/2310_award_patch_3_3_2.json
@@ -1,6 +1,5 @@
 {
   "data": {
-    "qualified": true,
     "status": "active"
   }
 }
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_1.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_2.json
similarity index 64%
rename from procedure_tools/data/negotiation.quick/2310_award_patch_0_1.json
rename to procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_2.json
index fa2c616..8d80434 100644
--- a/procedure_tools/data/negotiation.quick/2310_award_patch_0_1.json
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_0_2.json
@@ -1,6 +1,5 @@
 {
   "data": {
-    "qualified": true,
     "status": "active"
   }
 }
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_2.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_1_1.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_2.json b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU.lcc/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_2.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_2.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_1_1.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdEU/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThresholdEU/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThresholdEU/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_2.json b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdEU/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_2.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_2.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_1_1.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdUA.features/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThresholdUA.features/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThresholdUA.features/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_2.json b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.features/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_2.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_2.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_1_1.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_2.json b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA.lcc/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_0.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_2.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_0.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_2.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_1_1.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdUA/2310_award_patch_1_1.json
rename to procedure_tools/data/aboveThresholdUA/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_0.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2.json
rename to procedure_tools/data/aboveThresholdUA/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_0.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_2.json b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/aboveThresholdUA/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_0.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_2.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_0.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_2.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_1_1.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.central/2310_award_patch_1_1.json
rename to procedure_tools/data/belowThreshold.central/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_0.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..fdefca2
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.central/2310_award_patch_2_2.json
rename to procedure_tools/data/belowThreshold.central/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_0.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_2.json b/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.central/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_0.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_2.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_0.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_2.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_1_1.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.features/2310_award_patch_1_1.json
rename to procedure_tools/data/belowThreshold.features/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_0.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..fdefca2
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold.features/2310_award_patch_2_2.json
rename to procedure_tools/data/belowThreshold.features/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_0.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_2.json b/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold.features/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_0_0.json b/procedure_tools/data/belowThreshold/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/belowThreshold/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/belowThreshold/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_0_2.json b/procedure_tools/data/belowThreshold/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_1_0.json b/procedure_tools/data/belowThreshold/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_0_1_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/belowThreshold/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/belowThreshold/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_0_1_2.json b/procedure_tools/data/belowThreshold/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_1_1.json b/procedure_tools/data/belowThreshold/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/belowThreshold/2310_award_patch_1_1.json
rename to procedure_tools/data/belowThreshold/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_2_2_0.json b/procedure_tools/data/belowThreshold/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..fdefca2
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_2_2_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/belowThreshold/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/belowThreshold/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_2_2.json b/procedure_tools/data/belowThreshold/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/belowThreshold/2310_award_patch_2_2.json
rename to procedure_tools/data/belowThreshold/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_3_3_0.json b/procedure_tools/data/belowThreshold/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_3_3_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/belowThreshold/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/belowThreshold/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/belowThreshold/2310_award_patch_3_3_2.json b/procedure_tools/data/belowThreshold/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/belowThreshold/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_1_document_attach.json
new file mode 100644
index 0000000..89c4722
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_2_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_1_document_attach.json
new file mode 100644
index 0000000..296b181
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_0_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_1_3.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_1_3_0.json
similarity index 100%
rename from procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_1_3.json
rename to procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_1_3_0.json
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_1_document_attach.json
new file mode 100644
index 0000000..ebddbc5
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_4_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/2310_award_patch_2_4_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_0.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_2.json b/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA.central/4310_selection_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_1_document_attach.json
new file mode 100644
index 0000000..89c4722
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_2_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_1_document_attach.json
new file mode 100644
index 0000000..296b181
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_0_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_1_3.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_1_3_0.json
similarity index 100%
rename from procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_1_3.json
rename to procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_1_3_0.json
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_0.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_1_document_attach.json
new file mode 100644
index 0000000..ebddbc5
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_4_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_2.json b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/2310_award_patch_2_4_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_0.json b/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_1_document_attach.json b/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_2.json b/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/closeFrameworkAgreementUA/4310_selection_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_attach.json b/procedure_tools/data/competitiveDialogueEU/4210_stage2_evaluation_report_attach.json
similarity index 100%
rename from procedure_tools/data/competitiveDialogueEU/2210_stage2_evaluation_report_attach.json
rename to procedure_tools/data/competitiveDialogueEU/4210_stage2_evaluation_report_attach.json
diff --git a/procedure_tools/data/competitiveDialogueEU/4210_stage2_evaluation_report_file.p7s b/procedure_tools/data/competitiveDialogueEU/4210_stage2_evaluation_report_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_0.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_1_document_attach.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_2.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_0.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_1_document_attach.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_2.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_1_1.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_1_1.json
rename to procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_1_1_0.json
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_0.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_1_document_attach.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2.json
rename to procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_2_2_2.json
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_0.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_1_document_attach.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_2.json b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueEU/4310_stage2_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_0.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_2.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_0.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_2.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_1_1.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_1_1.json
rename to procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_1_1_0.json
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_0.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2.json
rename to procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_2_2_2.json
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_0.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_2.json b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA.features/4310_stage2_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_0.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_2.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_0.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_2.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_1_1.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_1_1.json
rename to procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_1_1_0.json
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_0.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2.json
rename to procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_2_2_2.json
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_0.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_1_document_attach.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_2.json b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/competitiveDialogueUA/4310_stage2_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_0.json b/procedure_tools/data/esco.features/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/esco.features/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_0_0.json b/procedure_tools/data/esco.features/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/esco.features/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/esco.features/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_0_2.json b/procedure_tools/data/esco.features/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_1.json b/procedure_tools/data/esco.features/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/esco.features/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_1_0.json b/procedure_tools/data/esco.features/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/esco.features/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/esco.features/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco.features/2310_award_patch_0_1_2.json b/procedure_tools/data/esco.features/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_1_1.json b/procedure_tools/data/esco.features/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/esco.features/2310_award_patch_1_1.json
rename to procedure_tools/data/esco.features/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/esco.features/2310_award_patch_2_2_0.json b/procedure_tools/data/esco.features/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/esco.features/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/esco.features/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco.features/2310_award_patch_2_2.json b/procedure_tools/data/esco.features/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/esco.features/2310_award_patch_2_2.json
rename to procedure_tools/data/esco.features/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/esco.features/2310_award_patch_3_3.json b/procedure_tools/data/esco.features/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/esco.features/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_3_3_0.json b/procedure_tools/data/esco.features/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/esco.features/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco.features/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/esco.features/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco.features/2310_award_patch_3_3_2.json b/procedure_tools/data/esco.features/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/esco.features/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_0.json b/procedure_tools/data/esco/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/esco/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_0_0.json b/procedure_tools/data/esco/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/esco/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/esco/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco/2310_award_patch_0_0_2.json b/procedure_tools/data/esco/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_1.json b/procedure_tools/data/esco/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/esco/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_1_0.json b/procedure_tools/data/esco/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/esco/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/esco/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco/2310_award_patch_0_1_2.json b/procedure_tools/data/esco/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_1_1.json b/procedure_tools/data/esco/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/esco/2310_award_patch_1_1.json
rename to procedure_tools/data/esco/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/esco/2310_award_patch_2_2_0.json b/procedure_tools/data/esco/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/esco/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/esco/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco/2310_award_patch_2_2.json b/procedure_tools/data/esco/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/esco/2310_award_patch_2_2.json
rename to procedure_tools/data/esco/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/esco/2310_award_patch_3_3.json b/procedure_tools/data/esco/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/esco/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_3_3_0.json b/procedure_tools/data/esco/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/esco/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/esco/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/esco/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/esco/2310_award_patch_3_3_2.json b/procedure_tools/data/esco/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/esco/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_0.json b/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_2.json b/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/negotiation.quick/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_0.json b/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_2.json b/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/negotiation.quick/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_0.json b/procedure_tools/data/negotiation/2310_award_patch_0_0.json
deleted file mode 100644
index fa2c616..0000000
--- a/procedure_tools/data/negotiation/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": {
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_0_0.json b/procedure_tools/data/negotiation/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/negotiation/2310_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/negotiation/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/negotiation/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/negotiation/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_0_2.json b/procedure_tools/data/negotiation/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/negotiation/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_1.json b/procedure_tools/data/negotiation/2310_award_patch_0_1.json
deleted file mode 100644
index fa2c616..0000000
--- a/procedure_tools/data/negotiation/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": {
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_1_0.json b/procedure_tools/data/negotiation/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/negotiation/2310_award_patch_0_1_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/negotiation/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/negotiation/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/negotiation/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/negotiation/2310_award_patch_0_1_2.json b/procedure_tools/data/negotiation/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/negotiation/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/reporting/2310_award_patch_0_0.json b/procedure_tools/data/reporting/2310_award_patch_0_0.json
deleted file mode 100644
index fa2c616..0000000
--- a/procedure_tools/data/reporting/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "data": {
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/reporting/2310_award_patch_0_0_0.json b/procedure_tools/data/reporting/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..7f7a270
--- /dev/null
+++ b/procedure_tools/data/reporting/2310_award_patch_0_0_0.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/reporting/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/reporting/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/reporting/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/reporting/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/reporting/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/reporting/2310_award_patch_0_0_2.json b/procedure_tools/data/reporting/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/reporting/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_0.json b/procedure_tools/data/simple.defense/2310_award_patch_0_0.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/simple.defense/2310_award_patch_0_0.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_0_0.json b/procedure_tools/data/simple.defense/2310_award_patch_0_0_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_0_0_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_0_1_document_attach.json b/procedure_tools/data/simple.defense/2310_award_patch_0_0_1_document_attach.json
new file mode 100644
index 0000000..5344a40
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_0_0_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_0_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_0_1_document_file.p7s b/procedure_tools/data/simple.defense/2310_award_patch_0_0_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_0_2.json b/procedure_tools/data/simple.defense/2310_award_patch_0_0_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_0_0_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_1.json b/procedure_tools/data/simple.defense/2310_award_patch_0_1.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/simple.defense/2310_award_patch_0_1.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_1_0.json b/procedure_tools/data/simple.defense/2310_award_patch_0_1_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_0_1_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_1_1_document_attach.json b/procedure_tools/data/simple.defense/2310_award_patch_0_1_1_document_attach.json
new file mode 100644
index 0000000..60e00a6
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_0_1_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_0_1_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_1_1_document_file.p7s b/procedure_tools/data/simple.defense/2310_award_patch_0_1_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_0_1_2.json b/procedure_tools/data/simple.defense/2310_award_patch_0_1_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_0_1_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_1_1.json b/procedure_tools/data/simple.defense/2310_award_patch_1_1_0.json
similarity index 100%
rename from procedure_tools/data/simple.defense/2310_award_patch_1_1.json
rename to procedure_tools/data/simple.defense/2310_award_patch_1_1_0.json
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_2_2_0.json b/procedure_tools/data/simple.defense/2310_award_patch_2_2_0.json
new file mode 100644
index 0000000..f2708dd
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_2_2_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": false,
+    "qualified": false
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_2_2_1_document_attach.json b/procedure_tools/data/simple.defense/2310_award_patch_2_2_1_document_attach.json
new file mode 100644
index 0000000..3abdbf3
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_2_2_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_2_2_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_2_2_1_document_file.p7s b/procedure_tools/data/simple.defense/2310_award_patch_2_2_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_2_2.json b/procedure_tools/data/simple.defense/2310_award_patch_2_2_2.json
similarity index 100%
rename from procedure_tools/data/simple.defense/2310_award_patch_2_2.json
rename to procedure_tools/data/simple.defense/2310_award_patch_2_2_2.json
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_3_3.json b/procedure_tools/data/simple.defense/2310_award_patch_3_3.json
deleted file mode 100644
index 34e372e..0000000
--- a/procedure_tools/data/simple.defense/2310_award_patch_3_3.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "data": {
-    "eligible": true,
-    "qualified": true,
-    "status": "active"
-  }
-}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_3_3_0.json b/procedure_tools/data/simple.defense/2310_award_patch_3_3_0.json
new file mode 100644
index 0000000..3ee9add
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_3_3_0.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "eligible": true,
+    "qualified": true
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_3_3_1_document_attach.json b/procedure_tools/data/simple.defense/2310_award_patch_3_3_1_document_attach.json
new file mode 100644
index 0000000..0038702
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_3_3_1_document_attach.json
@@ -0,0 +1,6 @@
+{
+  "data": {
+    "title": "award_patch_3_3_1_document_file.p7s",
+    "documentType": "notice"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_3_3_1_document_file.p7s b/procedure_tools/data/simple.defense/2310_award_patch_3_3_1_document_file.p7s
new file mode 100644
index 0000000..e69de29
diff --git a/procedure_tools/data/simple.defense/2310_award_patch_3_3_2.json b/procedure_tools/data/simple.defense/2310_award_patch_3_3_2.json
new file mode 100644
index 0000000..8d80434
--- /dev/null
+++ b/procedure_tools/data/simple.defense/2310_award_patch_3_3_2.json
@@ -0,0 +1,5 @@
+{
+  "data": {
+    "status": "active"
+  }
+}
\ No newline at end of file
diff --git a/procedure_tools/procedure.py b/procedure_tools/procedure.py
index fad7174..0727221 100644
--- a/procedure_tools/procedure.py
+++ b/procedure_tools/procedure.py
@@ -692,6 +692,7 @@ def process_procedure(
         while True:
             responses = patch_award(
                 client,
+                ds_client,
                 args,
                 context,
                 tender_id,
diff --git a/procedure_tools/utils/file.py b/procedure_tools/utils/file.py
index 3f16020..dfaec3d 100644
--- a/procedure_tools/utils/file.py
+++ b/procedure_tools/utils/file.py
@@ -94,3 +94,39 @@ def get_actual_file_path(path):
     glob_paths = glob.glob(pattern_path)
     actual_path = glob_paths[0] if glob_paths else path
     return actual_path
+
+
+def parse_data_file_parts(data_file, first_part, middle_parts_count):
+    """
+    Parse the data file parts.
+
+    Example:
+        >>> parse_data_file_parts("award_patch_0_0_0_document_attach.json", "award_patch", 3)
+        ("award_patch", ["0", "0", "0"], "document_attach", ["json"])
+    """
+    # Result: ["award_patch_0_0_0_document_attach", "json"]
+    data_file_parts = data_file.split(".")
+
+    # Result: ["json"]
+    extension_parts = data_file_parts[1:]
+
+    # Result: "award_patch_0_0_0_document_attach"
+    data_file_name = data_file_parts[0]
+
+    # Result: "0_0_0_document_attach"
+    middle_and_last_part = data_file_name.split(f"{first_part}_")[-1]
+
+    # Result: ["0", "0", "0"]
+    middle_parts = middle_and_last_part.split("_")[:middle_parts_count]
+
+    # Result: "document_attach"
+    last_part = data_file_name.split(f"{first_part}_{"_".join(middle_parts)}_")[-1]
+
+    # Result: ("award_patch" ,["0", "0", "0"], "document_attach", ["json"])
+    return first_part, middle_parts, last_part, extension_parts
+
+
+def generate_data_file_name(first_part, middle_parts, last_part, extension_parts):
+    return (
+        f"{first_part}_{"_".join(middle_parts)}_{last_part}.{".".join(extension_parts)}"
+    )
diff --git a/procedure_tools/utils/handlers.py b/procedure_tools/utils/handlers.py
index 83b0f8b..d0b1c01 100644
--- a/procedure_tools/utils/handlers.py
+++ b/procedure_tools/utils/handlers.py
@@ -7,6 +7,15 @@
 EX_DATAERR = 65
 
 
+def allow_null_success_handler(handler):
+    def wrapper(response):
+        if response.text == "null":
+            return default_success_handler(response)
+        handler(response)
+
+    return wrapper
+
+
 def error(text, allow_error=False):
     msg = fore_error(text)
     msg += "\n"
diff --git a/procedure_tools/utils/process.py b/procedure_tools/utils/process.py
index 08c7176..c8c20ad 100644
--- a/procedure_tools/utils/process.py
+++ b/procedure_tools/utils/process.py
@@ -15,12 +15,15 @@
 )
 from procedure_tools.utils.date import fix_datetime, get_utcnow, parse_date
 from procedure_tools.utils.file import (
+    generate_data_file_name,
     get_data_all_files,
     get_data_file_path,
     get_data_path,
+    parse_data_file_parts,
 )
 from procedure_tools.utils.handlers import (
     allow_error_handler,
+    allow_null_success_handler,
     auction_multilot_participation_url_success_handler,
     auction_participation_url_success_handler,
     bid_create_success_handler,
@@ -68,7 +71,7 @@ def upload_bids_proposal(
             tender_id,
             bid_id,
             bids_tokens[bid_index],
-            "bid_proposal_{}".format(bid_index),
+            "bid_proposal_{}_attach".format(bid_index),
             prefix=prefix,
         )
 
@@ -371,8 +374,35 @@ def patch_tender_waiting(client, args, context, tender_id, tender_token):
         )
 
 
+def upload_award_documents(
+    client,
+    ds_client,
+    args,
+    context,
+    tender_id,
+    award_id,
+    tender_token,
+    data_file_prefix,
+    prefix="",
+):
+    return upload_documents(
+        ds_client,
+        args,
+        context,
+        data_file_prefix=data_file_prefix,
+        attach_callback=partial(
+            client.post_tender_award_document,
+            tender_id,
+            award_id,
+            tender_token,
+        ),
+        prefix=prefix,
+    )
+
+
 def patch_award(
     client,
+    ds_client,
     args,
     context,
     tender_id,
@@ -381,31 +411,64 @@ def patch_award(
     action_index=0,
     prefix="",
 ):
+    """
+    Patch awards by action index.
+
+    Note: Award filename has the following format:
+        award_patch_{action_index}_{award_index}_{award_action_index}.json
+        award_patch_0_0_0.json
+    """
     logging.info("Patching awards...\n")
     award_patch_data_files = []
-    filename_base = "{}award_patch_{}".format(prefix, action_index)
+    action_name = "award_patch"
+    filename_base = "{}{}_{}".format(prefix, action_name, action_index)
     for data_file in get_data_all_files(get_data_path(args.data)):
         if data_file.startswith(filename_base):
             award_patch_data_files.append(data_file)
     responses = []
     for data_file in award_patch_data_files:
-        data_file_parts = data_file.split(".")
-        if len(data_file_parts) != 2 and data_file_parts[-1] != "json":
-            continue
-        path = get_data_file_path(get_data_path(args.data), data_file)
-        award_index = int(data_file_parts[0].split("_")[-1])
-        awards_id = awards_ids[award_index]
-        with read_file(path, context=context, exit_filename=args.stop) as content:
-            award_patch_data = json.loads(content)
-            response = client.patch_tender_award(
+        action_name, action_parts, action_extra, extension_parts = (
+            parse_data_file_parts(data_file, action_name, 3)
+        )
+
+        print(data_file, action_name, action_parts, action_extra, extension_parts)
+
+        # Award index is the second last part of the filename
+        award_index = int(action_parts[1])
+
+        # Get award id by index
+        award_id = awards_ids[award_index]
+
+        if action_extra == "document_attach":
+            data_file_prefix = generate_data_file_name(
+                action_name, action_parts, action_extra, extension_parts
+            )
+            upload_award_documents(
+                client,
+                ds_client,
+                args,
+                context,
                 tender_id,
-                awards_id,
+                award_id,
                 tender_token,
-                award_patch_data,
-                auth_token=args.token,
-                success_handler=item_patch_success_handler,
+                data_file_prefix=data_file_prefix,
+                prefix=prefix,
             )
-            responses.append(response)
+        elif extension_parts[-1] == "json":
+            path = get_data_file_path(get_data_path(args.data), data_file)
+            with read_file(path, context=context, exit_filename=args.stop) as content:
+                award_patch_data = json.loads(content)
+                response = client.patch_tender_award(
+                    tender_id,
+                    award_id,
+                    tender_token,
+                    award_patch_data,
+                    auth_token=args.token,
+                    success_handler=allow_null_success_handler(
+                        item_patch_success_handler,
+                    ),
+                )
+                responses.append(response)
     return responses
 
 
@@ -662,22 +725,21 @@ def create_tender(
 
 
 def upload_documents(
-    client,
     ds_client,
     args,
     context,
-    data_name,
+    data_file_prefix,
     attach_callback,
     ignore_error=False,
     prefix="",
 ):
     responses = []
     for data_file in get_data_all_files(get_data_path(args.data)):
-        if data_file.startswith("{}{}_attach".format(prefix, data_name)):
+        if data_file.startswith("{}{}".format(prefix, data_file_prefix)):
             path = get_data_file_path(get_data_path(args.data), data_file)
             with read_file(path, context=context, exit_filename=args.stop) as content:
                 tender_document_data = json.loads(content)
-                upload_file = tender_document_data["data"]["title"]
+                upload_file = f"{prefix}{tender_document_data["data"]["title"]}"
                 ds_response = upload_document_ds(ds_client, args, context, upload_file)
                 if ds_response:
                     document_data = ds_response.json()["data"]
@@ -707,11 +769,10 @@ def upload_tender_documents(
     prefix="",
 ):
     return upload_documents(
-        client,
         ds_client,
         args,
         context,
-        data_name="tender_document",
+        data_file_prefix="tender_document_attach",
         attach_callback=partial(
             client.post_tender_document,
             tender_id,
@@ -731,11 +792,10 @@ def upload_tender_notice(
     prefix="",
 ):
     return upload_documents(
-        client,
         ds_client,
         args,
         context,
-        data_name="tender_notice",
+        data_file_prefix="tender_notice_attach",
         attach_callback=partial(
             client.post_tender_document,
             tender_id,
@@ -753,15 +813,14 @@ def upload_bid_proposal(
     tender_id,
     bid_id,
     bid_token,
-    data_name,
+    data_file_prefix,
     prefix="",
 ):
     return upload_documents(
-        client,
         ds_client,
         args,
         context,
-        data_name,
+        data_file_prefix,
         attach_callback=partial(
             client.post_tender_bid_document,
             tender_id,
@@ -782,11 +841,10 @@ def upload_evaluation_report(
     prefix="",
 ):
     return upload_documents(
-        client,
         ds_client,
         args,
         context,
-        "evaluation_report",
+        "evaluation_report_attach",
         attach_callback=partial(
             client.post_tender_document,
             tender_id,
@@ -809,11 +867,10 @@ def re_upload_evaluation_report(
     prefix="",
 ):
     return upload_documents(
-        client,
         ds_client,
         args,
         context,
-        "evaluation_report",
+        "evaluation_report_attach",
         attach_callback=partial(
             client.put_tender_document,
             tender_id,